From 375c3c05d463ec186c6dae48a36d47a9f5ee37d6 Mon Sep 17 00:00:00 2001 From: Muhammad Faizan Date: Tue, 17 Sep 2024 16:31:30 +0200 Subject: [PATCH] updated --- .github/workflows/pull-e2e-test.yml | 61 +++++++++++ .github/workflows/pull-e2e-upgrade-test.yaml | 105 ------------------- 2 files changed, 61 insertions(+), 105 deletions(-) delete mode 100644 .github/workflows/pull-e2e-upgrade-test.yaml diff --git a/.github/workflows/pull-e2e-test.yml b/.github/workflows/pull-e2e-test.yml index 40d7fcc8..7990ab06 100644 --- a/.github/workflows/pull-e2e-test.yml +++ b/.github/workflows/pull-e2e-test.yml @@ -139,3 +139,64 @@ jobs: if: failure() run: | kubectl get nats --all-namespaces + + e2e-upgrade: # This job tests the upgrade of NATS module from latest image of the main branch to the current commit. + name: e2e-upgrade + needs: [ wait-for-build-job ] + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Cache Go dependencies + uses: actions/setup-go@v5 + with: + go-version-file: "./go.mod" + check-latest: true + cache-dependency-path: "./go.sum" + + - run: go version + + - name: Install k3d tools + run: | + make -C hack/ci/ install-k3d-tools + + - name: Install Kyma CLI & setup k3d cluster using kyma CLI + run: | + make kyma + make -C hack/ci/ create-k3d + kubectl version + kubectl cluster-info + + - name: Install latest NATS manager from main branch + run: | + make -C hack/ci/ create-kyma-system-ns + make deploy IMG=europe-docker.pkg.dev/kyma-project/prod/nats-manager:main + + - name: Setup & test NATS CR + run: | + make e2e-setup + + - name: Install the new NATS manager from current commit + run: | + make deploy IMG=${DOCKER_IMAGE} + + - name: Wait for new changes to be reflected + # Waits for NATS-manager image to be updated and NATS CR readiness. + run: | + export MANAGER_IMAGE=${DOCKER_IMAGE} + make e2e-setup + + - name: Run NATS bench + run: | + go install github.com/nats-io/natscli/nats@latest + export PATH=$HOME/go/bin:$PATH + make e2e-bench + + - name: Test NATS-server + run: | + make e2e-nats-server + + - name: Cleanup NATS CR + run: | + make e2e-cleanup diff --git a/.github/workflows/pull-e2e-upgrade-test.yaml b/.github/workflows/pull-e2e-upgrade-test.yaml deleted file mode 100644 index 4193a29d..00000000 --- a/.github/workflows/pull-e2e-upgrade-test.yaml +++ /dev/null @@ -1,105 +0,0 @@ -name: pull-e2e-upgrade-test - -env: - DOCKER_IMAGE: europe-docker.pkg.dev/kyma-project/dev/nats-manager:PR-${{ github.event.number }} - E2E_LOG_LEVEL: debug - KYMA_STABILITY: "unstable" - KYMA: "./hack/kyma" - -on: - pull_request: - branches: ["main"] - paths-ignore: - - "docs/**" - - "**.md" - - "sec-scanners-config.yaml" - -jobs: - e2e-upgrade: # This job tests the upgrade of NATS module from latest image of the main branch to the current commit. - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Cache Go dependencies - uses: actions/setup-go@v5 - with: - go-version-file: "./go.mod" - check-latest: true - cache-dependency-path: "./go.sum" - - - run: go version - - - name: Install k3d tools - run: | - make -C hack/ci/ install-k3d-tools - - - name: Install Kyma CLI & setup k3d cluster using kyma CLI - run: | - make kyma - make -C hack/ci/ create-k3d - kubectl version - kubectl cluster-info - - - name: Install latest NATS manager from main branch - run: | - make -C hack/ci/ create-kyma-system-ns - make deploy IMG=europe-docker.pkg.dev/kyma-project/prod/nats-manager:main - - - name: Setup & test NATS CR - run: | - make e2e-setup - - - name: Wait for build job - Checkout eventing-tools - uses: actions/checkout@v4 - with: - repository: 'kyma-project/eventing-tools' - path: 'kyma-project/eventing-tools' - ref: main - sparse-checkout: 'scripts/wait-for-commit-check' - - - name: Wait for build job - Setup python - uses: actions/setup-python@v5 - with: - python-version: '3.10' - cache: 'pip' - - - name: Wait for build job - Install requirements - run: | - pip install -r $GITHUB_WORKSPACE/kyma-project/eventing-tools/scripts/wait-for-commit-check/requirements.txt - - - name: Wait for build job - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - REPOSITORY_FULL_NAME: ${{ github.repository_owner }}/nats-manager - GIT_REF: "${{ github.event.pull_request.head.sha }}" # Note: 'github.event.pull_request.head.sha' is not same as 'github.sha' on pull requests. - # The re-usable image-builder workflow from neighbors appends the "Build image" suffix to the check run name. - GIT_CHECK_RUN_NAME: "build / Build image" - INTERVAL: 60 - TIMEOUT: 900 - run: | - python $GITHUB_WORKSPACE/kyma-project/eventing-tools/scripts/wait-for-commit-check/run.py - - - name: Install the new NATS manager from current commit - run: | - make deploy IMG=${DOCKER_IMAGE} - - - name: Wait for new changes to be reflected - # Waits for NATS-manager image to be updated and NATS CR readiness. - run: | - export MANAGER_IMAGE=${DOCKER_IMAGE} - make e2e-setup - - - name: Run NATS bench - run: | - go install github.com/nats-io/natscli/nats@latest - export PATH=$HOME/go/bin:$PATH - make e2e-bench - - - name: Test NATS-server - run: | - make e2e-nats-server - - - name: Cleanup NATS CR - run: | - make e2e-cleanup