From bf737e7fb93db6546c59f7ad432e05950ded7156 Mon Sep 17 00:00:00 2001 From: brais <26645694+braisvq1996@users.noreply.github.com> Date: Wed, 17 Jan 2024 17:32:38 +0100 Subject: [PATCH 1/6] change Aqua scanner execution folder (#1068) --- CHANGELOG.md | 1 + src/org/ods/services/AquaService.groovy | 2 +- test/groovy/org/ods/services/AquaServiceSpec.groovy | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84f696a7d..682162eab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unreleased * Fix Tailor deployment drifts for D, Q envs ([#1055](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1055)) +* Aqua scanner and Helm deployment conflict fix for jenkins shared library ([#1067](https://github.com/opendevstack/ods-jenkins-shared-library/issues/1067)) ## [4.3.3] - 2023-11-07 diff --git a/src/org/ods/services/AquaService.groovy b/src/org/ods/services/AquaService.groovy index b1e371358..b9b97fb56 100644 --- a/src/org/ods/services/AquaService.groovy +++ b/src/org/ods/services/AquaService.groovy @@ -37,7 +37,7 @@ class AquaService { --scan-timeout ${timeout} \ --htmlfile '${reportFile}' \ --jsonfile '${jsonFile}' \ - -w /home/jenkins \ + -w /tmp/aqua \ -U '${username}' \ -P '${password}' \ -H '${aquaUrl}' \ diff --git a/test/groovy/org/ods/services/AquaServiceSpec.groovy b/test/groovy/org/ods/services/AquaServiceSpec.groovy index 325ed64f4..146f78bfc 100644 --- a/test/groovy/org/ods/services/AquaServiceSpec.groovy +++ b/test/groovy/org/ods/services/AquaServiceSpec.groovy @@ -52,7 +52,7 @@ class AquaServiceSpec extends PipelineSpockTestBase { assert it.script.toString().contains('--scan-timeout 100') assert it.script.toString().contains('--htmlfile \'report.html\'') assert it.script.toString().contains('--jsonfile \'report.json\'') - assert it.script.toString().contains('-w /home/jenkins') + assert it.script.toString().contains('-w /tmp/aqua') assert it.script.toString().contains('-U \'user\'') assert it.script.toString().contains('-P \'pass\'') assert it.script.toString().contains('-H \'http://aqua\'') From 39cbb3e2a98d4da06b6309d315cf98de2d7c68c8 Mon Sep 17 00:00:00 2001 From: serverhorror <36151+serverhorror@users.noreply.github.com> Date: Mon, 29 Jan 2024 09:18:00 +0100 Subject: [PATCH 2/6] Fix documentation: documentation refers to qs with prefix infra- however there are only inf- quickstarters (#1063) --- CHANGELOG.md | 1 + .../jenkins-shared-library/pages/orchestration-pipeline.adoc | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 682162eab..146e1dc56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog ## Unreleased +* Fix documentation refers to qs with prefix infra- however there are only inf- quickstarters ([#1060](https://github.com/opendevstack/ods-jenkins-shared-library/issues/1060)) * Fix Tailor deployment drifts for D, Q envs ([#1055](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1055)) * Aqua scanner and Helm deployment conflict fix for jenkins shared library ([#1067](https://github.com/opendevstack/ods-jenkins-shared-library/issues/1067)) diff --git a/docs/modules/jenkins-shared-library/pages/orchestration-pipeline.adoc b/docs/modules/jenkins-shared-library/pages/orchestration-pipeline.adoc index c7da1aff7..52fed3979 100644 --- a/docs/modules/jenkins-shared-library/pages/orchestration-pipeline.adoc +++ b/docs/modules/jenkins-shared-library/pages/orchestration-pipeline.adoc @@ -69,7 +69,7 @@ If you use this type ODS expects to find JUnit XML test results. If you do not h ==== Repository Type: ods-infra -This type designates ODS components designed for _consuming on-prem or cloud services_ of arbitrary type using infrastructure as code. Such components are based on quickstarters whose names start with `infra-`. +This type designates ODS components designed for _consuming on-prem or cloud services_ of arbitrary type using infrastructure as code. Such components are based on quickstarters whose names start with `inf-`. ==== Repository Type: ods-saas-service @@ -159,7 +159,7 @@ alwaysPullImage: true ---- By default the orchestration pipeline will create a pod based on the jenkins-base-agent image to do much of its work. -In seldom cases, ususally with a lot of repositories, one may hit an out of memory error on the pod named 'mro-XX'. In this case the below +In seldom cases, ususally with a lot of repositories, one may hit an out of memory error on the pod named 'mro-XX'. In this case the below memory limit should be adjusted (defaulting to '1Gi') ---- mroAgentMemoryLimit = "1Gi" From 114accebf433c41acccf611af964f19079552a30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 09:38:46 +0100 Subject: [PATCH 3/6] Bump actions/checkout from 4.1.0 to 4.1.1 (#1050) --- .github/workflows/changelog-enforcer.yml | 2 +- .github/workflows/gradle.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/changelog-enforcer.yml b/.github/workflows/changelog-enforcer.yml index 6205eddbd..f3e87f365 100644 --- a/.github/workflows/changelog-enforcer.yml +++ b/.github/workflows/changelog-enforcer.yml @@ -8,7 +8,7 @@ jobs: changelog: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4.1.0 + - uses: actions/checkout@v4.1.1 - uses: dangoslen/changelog-enforcer@v3 with: changeLogPath: 'CHANGELOG.md' diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index f6821e778..526edf6aa 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.0 + uses: actions/checkout@v4.1.1 - name: check the value of github.workspace and runner.temp run: | From bdb2ea3e14d10df4a3d9e78d04ca4337224b2a72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 09:39:34 +0100 Subject: [PATCH 4/6] Bump actions/setup-java from 3 to 4 (#1059) --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 526edf6aa..cbbe74caa 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -15,7 +15,7 @@ jobs: echo "runner.temp = ${{ runner.temp }}" - name: Set up OpenJDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '11' From d8a96011525e7a3b0764631a3fcc9f6c447d53cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 09:40:19 +0100 Subject: [PATCH 5/6] Bump actions/upload-artifact from 3 to 4 (#1064) --- .github/workflows/gradle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index cbbe74caa..1377fdb12 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -41,14 +41,14 @@ jobs: NO_NEXUS: true - name: CodeNarc Report - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: name: CodeNarc Report path: build/reports/codenarc/main.html - name: Test Report - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: name: Test Report From 25808a5eee11bc0df1c502ba651844214f03b663 Mon Sep 17 00:00:00 2001 From: brais <26645694+braisvq1996@users.noreply.github.com> Date: Mon, 29 Jan 2024 11:23:53 +0100 Subject: [PATCH 6/6] Added labels to dependabot (#1069) --- .github/dependabot.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index dfd0e3086..a107609a1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,3 +8,6 @@ updates: schedule: # Check for updates to GitHub Actions every week interval: "weekly" + labels: + - "dependencies" + - "skip changelog"