diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index e3938608e..6ee3c1237 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -23,25 +23,9 @@ jobs: id: changed-files uses: tj-actions/changed-files@v45 - gooddata-ruby-lcm-integration-e2e: - needs: - - prepare-env - uses: ./.github/workflows/lcm-integration-e2e.yaml - secrets: inherit - permissions: - id-token: write - contents: read - if: ${{ needs.prepare-env.outputs.branch == 'master' }} - with: - AUTO_MERGE: false - base_branch: ${{ needs.prepare-env.outputs.branch }} - pr_number: ${{ needs.prepare-env.outputs.pr_number }} - java_version: '11' - ruby_version: 'jruby-9.4.12.1' - gooddata-ruby-lcm-build-pipeline: needs: - - gooddata-ruby-lcm-integration-e2e + - prepare-env permissions: contents: read id-token: write diff --git a/.github/workflows/lcm-integration-e2e.yaml b/.github/workflows/lcm-integration-e2e.yaml index 3366ac191..352312651 100644 --- a/.github/workflows/lcm-integration-e2e.yaml +++ b/.github/workflows/lcm-integration-e2e.yaml @@ -3,18 +3,6 @@ name: LCM Integration E2E Pipeline on: workflow_call: inputs: - AUTO_MERGE: - default: true - required: false - type: boolean - description: Must be set here in order to use in if condition at job level. - base_branch: - required: true - type: string - description: The base branch to compare against for detecting changes. - pr_number: - required: true - type: string java_version: required: true type: string @@ -25,7 +13,6 @@ on: env: RT_S3_BUCKET_NAME: "gdc-dev-eu-integration-tests" JAVA_HOME: /usr/lib/jvm/java-${{ inputs.java_version }}-openjdk-amd64 - PATH: /usr/lib/jvm/java-${{ inputs.java_version }}-openjdk-amd64/bin:/usr/local/bin:/usr/bin:/bin jobs: LCM-integration-e2e-tests: @@ -36,6 +23,10 @@ jobs: id-token: write contents: read steps: + - name: Add java path + run: | + echo "${JAVA_HOME}/bin" >> $GITHUB_PATH + - name: Checkout repository uses: actions/checkout@v4 with: diff --git a/.github/workflows/lcm-pipeline.yaml b/.github/workflows/lcm-pipeline.yaml index 3aaa1b58a..d3a3b28fe 100644 --- a/.github/workflows/lcm-pipeline.yaml +++ b/.github/workflows/lcm-pipeline.yaml @@ -246,11 +246,30 @@ jobs: wait_retries: ${{ matrix.hr.waitRetries }} pipeline_identifier: ${{ needs.prepare-build.outputs.pipeline_identifier }} + lcm-integration-e2e: + needs: [ prepare-build, build-helmreleases, wait-for-deployment ] + if: | + !cancelled() && + !contains(needs.*.result, 'failure') && + needs.build-helmreleases.result == 'success' && + inputs.deploy + uses: ./.github/workflows/lcm-integration-e2e.yaml + secrets: inherit + permissions: + id-token: write + contents: read + with: + java_version: '11' + ruby_version: 'jruby-9.4.12.1' + revert-staging-pr: - needs: [ create-staging-pr, wait-for-deployment ] + needs: [ create-staging-pr, wait-for-deployment, lcm-integration-e2e ] if: | !cancelled() && - needs.wait-for-deployment.result == 'failure' && + ( + needs.wait-for-deployment.result == 'failure' || + needs.lcm-integration-e2e.result == 'failure' + ) && inputs.deploy uses: ./.github/workflows/revert-staging-pr.yaml with: @@ -259,7 +278,7 @@ jobs: secrets: inherit promote-to-stable: - needs: [ prepare-build, services-build, build-helmreleases, wait-for-deployment ] + needs: [ prepare-build, services-build, build-helmreleases, wait-for-deployment, lcm-integration-e2e ] if: | !cancelled() && !contains(needs.*.result, 'failure') &&