From 255d815c7183bb214776494bf420e7a1bf73614e Mon Sep 17 00:00:00 2001 From: Matej Klima Date: Mon, 16 Mar 2026 10:01:24 +0100 Subject: [PATCH 1/3] fix: run integration tests after deploy to staging Integration tests will now be run in the gating workflow after the deployment to the staging cluster JIRA: GRIF-524 --- .github/workflows/check.yaml | 18 +----------------- .github/workflows/lcm-pipeline.yaml | 28 +++++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 20 deletions(-) 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-pipeline.yaml b/.github/workflows/lcm-pipeline.yaml index 3aaa1b58a..9cb5691f9 100644 --- a/.github/workflows/lcm-pipeline.yaml +++ b/.github/workflows/lcm-pipeline.yaml @@ -246,11 +246,33 @@ 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: + AUTO_MERGE: ${{ inputs.AUTO_MERGE }} + base_branch: ${{ inputs.base_branch }} + pr_number: ${{ inputs.pr_number }} + 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 +281,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') && From 4a50a4583cfff5819b190a210936f21560fb4037 Mon Sep 17 00:00:00 2001 From: Matej Klima Date: Mon, 16 Mar 2026 10:05:00 +0100 Subject: [PATCH 2/3] chore: remove unnecessary inputs JIRA: GRIF-524 --- .github/workflows/lcm-integration-e2e.yaml | 12 ------------ .github/workflows/lcm-pipeline.yaml | 3 --- 2 files changed, 15 deletions(-) diff --git a/.github/workflows/lcm-integration-e2e.yaml b/.github/workflows/lcm-integration-e2e.yaml index 3366ac191..5f7986cb4 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 diff --git a/.github/workflows/lcm-pipeline.yaml b/.github/workflows/lcm-pipeline.yaml index 9cb5691f9..d3a3b28fe 100644 --- a/.github/workflows/lcm-pipeline.yaml +++ b/.github/workflows/lcm-pipeline.yaml @@ -259,9 +259,6 @@ jobs: id-token: write contents: read with: - AUTO_MERGE: ${{ inputs.AUTO_MERGE }} - base_branch: ${{ inputs.base_branch }} - pr_number: ${{ inputs.pr_number }} java_version: '11' ruby_version: 'jruby-9.4.12.1' From ce529dd8bf0647f524048fa0ba83b676578c3725 Mon Sep 17 00:00:00 2001 From: Matej Klima Date: Mon, 16 Mar 2026 10:06:58 +0100 Subject: [PATCH 3/3] fix: java path configuration JIRA: GRIF-524 --- .github/workflows/lcm-integration-e2e.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lcm-integration-e2e.yaml b/.github/workflows/lcm-integration-e2e.yaml index 5f7986cb4..352312651 100644 --- a/.github/workflows/lcm-integration-e2e.yaml +++ b/.github/workflows/lcm-integration-e2e.yaml @@ -13,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: @@ -24,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: