From ab8ef8c01c637903abc876b0b40fb9cf6cccf27b Mon Sep 17 00:00:00 2001 From: Vitor Cardoso Date: Tue, 8 Oct 2024 15:30:20 +0100 Subject: [PATCH] [DEVO-10737] - Preparing reusable workflows to be compatible with cache less runners --- .github/workflows/merge.yml | 61 ++++++++++++++++--------------------- .github/workflows/pr.yml | 31 +++++-------------- 2 files changed, 33 insertions(+), 59 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 227b850..5244ef5 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -104,8 +104,9 @@ env: jobs: - setup-maven-settings: - name: Setup Maven settings + snapshot: + if: ${{ inputs.run_snapshot == true }} + name: Update Snapshots runs-on: [ k8s ] @@ -128,25 +129,6 @@ jobs: run: | cp "${{ steps.common-maven.outputs.settings-file-path }}" /root/.m2 - snapshot: - if: ${{ inputs.run_snapshot == true }} - name: Update Snapshots - needs: setup-maven-settings - - runs-on: [ k8s ] - - container: - image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20240305.137 - credentials: - username: ${{ secrets.PENTAHO_CICD_ONE_USER }} - password: ${{ secrets.PENTAHO_CICD_ONE_KEY }} - volumes: - - /home/runner/caches/pentaho/.m2:/root/.m2 - steps: - - - run: | - echo ${{ needs.setup-maven-settings.env }} - - name: Checkout code uses: actions/checkout@v4 with: @@ -185,12 +167,12 @@ jobs: int_test_fail_on_error: 'true' int_test_report_path: '**/target/failsafe-reports/TEST*.xml' - - name: Sonarqube scan - continue-on-error: true - uses: lumada-common-services/gh-composite-actions@stable - env: - sonar_utility: sonar-scanner - sonar_commands: '("-Dsonar.working.directory=/tmp/.scannerwork -Dsonar.projectKey=${{env.SONAR_PROJECT_KEY}} -Dsonar.host.url=${{env.SONAR_HOST_URL}} -Dsonar.login=${{env.SONAR_LOGIN}}")' +# - name: Sonarqube scan +# continue-on-error: true +# uses: lumada-common-services/gh-composite-actions@stable +# env: +# sonar_utility: sonar-scanner +# sonar_commands: '("-Dsonar.working.directory=/tmp/.scannerwork -Dsonar.projectKey=${{env.SONAR_PROJECT_KEY}} -Dsonar.host.url=${{env.SONAR_HOST_URL}} -Dsonar.login=${{env.SONAR_LOGIN}}")' - name: Report notifications if: always() @@ -203,7 +185,6 @@ jobs: release-candidate: if: ${{ inputs.run_release_candidate == true }} name: Build Release Candidate - needs: setup-maven-settings runs-on: [ k8s ] @@ -217,8 +198,18 @@ jobs: password: ${{ secrets.PENTAHO_CICD_ONE_KEY }} volumes: - /home/runner/caches/pentaho/.m2:/root/.m2 + steps: + - name: Retrieve settings file + id: common-maven + uses: pentaho/actions-common@stable + + - name: Copy settings.xml to .m2 directory + shell: sh + run: | + cp "${{ steps.common-maven.outputs.settings-file-path }}" /root/.m2 + - id: initial-setup shell: bash run: | @@ -304,13 +295,13 @@ jobs: int_test_fail_on_error: 'true' int_test_report_path: '**/target/failsafe-reports/TEST*.xml' - - name: Sonarqube scan - if: ${{ inputs.run_snapshot == false }} - continue-on-error: true - uses: lumada-common-services/gh-composite-actions@stable - env: - sonar_utility: sonar-scanner - sonar_commands: '("-Dsonar.working.directory=/tmp/.scannerwork -Dsonar.projectKey=${{env.SONAR_PROJECT_KEY}} -Dsonar.host.url=${{env.SONAR_HOST_URL}} -Dsonar.login=${{env.SONAR_LOGIN}}")' +# - name: Sonarqube scan +# if: ${{ inputs.run_snapshot == false }} +# continue-on-error: true +# uses: lumada-common-services/gh-composite-actions@stable +# env: +# sonar_utility: sonar-scanner +# sonar_commands: '("-Dsonar.working.directory=/tmp/.scannerwork -Dsonar.projectKey=${{env.SONAR_PROJECT_KEY}} -Dsonar.host.url=${{env.SONAR_HOST_URL}} -Dsonar.login=${{env.SONAR_LOGIN}}")' - name: Tag release uses: lumada-common-services/gh-composite-actions@stable diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 04c0424..0512763 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -56,9 +56,8 @@ env: jobs: - setup-maven-settings: - name: Setup Maven settings - + common-job: + name: Common Checks runs-on: [ k8s ] container: @@ -79,22 +78,6 @@ jobs: shell: sh run: | cp "${{ steps.common-maven.outputs.settings-file-path }}" /root/.m2 - - - common-job: - name: Common Checks - needs: setup-maven-settings - runs-on: [ k8s ] - - container: - image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20240305.137 - credentials: - username: ${{ secrets.PENTAHO_CICD_ONE_USER }} - password: ${{ secrets.PENTAHO_CICD_ONE_KEY }} - volumes: - - /home/runner/caches/pentaho/.m2:/root/.m2 - - steps: - name: Load Job metadata into Env vars shell: bash @@ -157,11 +140,11 @@ jobs: int_test_fail_on_error: 'true' int_test_report_path: '**/target/failsafe-reports/TEST*.xml' - - name: Sonarqube scan - uses: lumada-common-services/gh-composite-actions@stable - env: - sonar_utility: sonar-scanner - sonar_commands: '("-Dsonar.projectKey=${{env.SONAR_PROJECT_KEY}} -Dsonar.host.url=${{env.SONAR_HOST_URL}} -Dsonar.login=${{env.SONAR_LOGIN}} -Dsonar.pullrequest.key=${{github.event.number}} -Dsonar.pullrequest.branch=${{github.event.pull_request.head.ref}} -Dsonar.pullrequest.base=${{github.event.pull_request.base.ref}}")' +# - name: Sonarqube scan +# uses: lumada-common-services/gh-composite-actions@stable +# env: +# sonar_utility: sonar-scanner +# sonar_commands: '("-Dsonar.projectKey=${{env.SONAR_PROJECT_KEY}} -Dsonar.host.url=${{env.SONAR_HOST_URL}} -Dsonar.login=${{env.SONAR_LOGIN}} -Dsonar.pullrequest.key=${{github.event.number}} -Dsonar.pullrequest.branch=${{github.event.pull_request.head.ref}} -Dsonar.pullrequest.base=${{github.event.pull_request.base.ref}}")' - name: FrogBot scan uses: lumada-common-services/gh-composite-actions@stable