diff --git a/.github/workflows/pull-e2e-upgrade-test.yaml b/.github/workflows/pull-e2e-upgrade-test.yaml index 7b6bf823..3242ca67 100644 --- a/.github/workflows/pull-e2e-upgrade-test.yaml +++ b/.github/workflows/pull-e2e-upgrade-test.yaml @@ -10,7 +10,7 @@ on: jobs: upgrade-test: - uses: ./.github/workflows/run-upgrade-tests-reusable.yaml + uses: ./.github/workflows/upgrade-tests-reusable.yaml with: pre-upgrade-image-tag: main post-upgrade-image-tag: PR-${{ github.event.number }} diff --git a/.github/workflows/push-e2e-upgrade-test.yaml b/.github/workflows/push-e2e-upgrade-test.yaml index 43b8e1a9..7a325f8c 100644 --- a/.github/workflows/push-e2e-upgrade-test.yaml +++ b/.github/workflows/push-e2e-upgrade-test.yaml @@ -1,7 +1,7 @@ name: post-e2e-upgrade-test on: - pull_request: + push: branches: [ "main" ] paths-ignore: - 'docs/**' @@ -16,9 +16,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - # checkout the current branch - with: - ref: ${{ github.event.pull_request.head.sha }} - name: Get latest release tag id: get-latest-release-tag @@ -26,11 +23,11 @@ jobs: echo "latest_release_tag=$(curl -s https://api.github.com/repos/kyma-project/eventing-manager/releases/latest | jq -r '.tag_name')" >> "$GITHUB_OUTPUT" upgrade-test: - uses: ./.github/workflows/run-upgrade-tests-reusable.yaml + uses: ./.github/workflows/upgrade-tests-reusable.yaml needs: get-latest-release with: pre-upgrade-image-tag: ${{ needs.get-latest-release.outputs.latest_release_tag }} post-upgrade-image-tag: main - build-job-name: pull-eventing-manager-build - build-job-commit-sha: ${{ github.event.pull_request.head.sha }} + build-job-name: push-eventing-manager-build + build-job-commit-sha: ${{ github.sha }} secrets: inherit diff --git a/.github/workflows/run-upgrade-tests-reusable.yaml b/.github/workflows/upgrade-tests-reusable.yaml similarity index 95% rename from .github/workflows/run-upgrade-tests-reusable.yaml rename to .github/workflows/upgrade-tests-reusable.yaml index d0263dd5..c67d6a1f 100644 --- a/.github/workflows/run-upgrade-tests-reusable.yaml +++ b/.github/workflows/upgrade-tests-reusable.yaml @@ -14,12 +14,6 @@ on: post-upgrade-image-tag: required: true type: string - pre-upgrade-branch: - type: string - default: ${{ inputs.pre-upgrade-image-tag }} - post-upgrade-branch: - type: string - default: ${{ inputs.post-upgrade-image-tag }} build-job-name: type: string build-job-commit-sha: