Merge branch 'master' into bug/1038-helm-deployment-issues-with-custo…

…m-chartdir-option # Conflicts: # CHANGELOG.md
serverhorror · Feb 6, 2024 · f280759 · f280759
2 parents 3b08088 + 25808a5
commit f280759
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git 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"
diff --git 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/[email protected].0
+      - uses: actions/[email protected].1
       - uses: dangoslen/changelog-enforcer@v3
         with:
           changeLogPath: 'CHANGELOG.md'

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -7,15 +7,15 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Checkout
-              uses: actions/[email protected].0
+              uses: actions/[email protected].1
 
             - name: check the value of github.workspace and runner.temp
               run: |
                 echo "github.workspace = ${{ github.workspace }}"
                 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'
@@ -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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,10 @@
 # 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))
 * Fix Helm deployment issues with custom chartDir ([#1038](https://github.com/opendevstack/ods-jenkins-shared-library/issues/1038))
+* 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
 * Add better documentation for Helm ([#1027](https://github.com/opendevstack/ods-jenkins-shared-library/issues/1027))

diff --git 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"

diff --git 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
@@ -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\'')