Merge branch 'main' into CLM-33049-pass-iq-server-jobs-annotations

sonatype · Dec 12, 2024 · 00fb76a · 00fb76a
2 parents f2d8d8c + a5982ca
commit 00fb76a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/.github/workflows/helm-tests.yaml b/.github/workflows/helm-tests.yaml
@@ -0,0 +1,34 @@
+name: Helm Tests
+
+on:
+  pull_request:
+    branches:
+      - '**'
+
+jobs:
+  helm-tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Helm
+        uses: azure/setup-helm@v3
+        with:
+          version: v3.14.4
+
+      - name: Install dependencies
+        run: helm dependency update chart/
+
+      - name: Run Helm lint
+        run: helm lint chart/
+
+      - name: Run Helm template
+        run: helm template chart/
+
+      - name: Install unittest plugin
+        run: helm plugin install https://github.com/quintush/helm-unittest --version v0.2.11
+
+      - name: Run Helm tests
+        run: helm unittest --helm3 chart/
diff --git a/chart/templates/iq-server-jobs.yaml b/chart/templates/iq-server-jobs.yaml
@@ -97,7 +97,7 @@ spec:
           command:
             - /bin/sh
             - -c
-            - "/usr/bin/java -jar `ls ./nexus-iq-server*.jar` migrate-db /etc/nexus-iq-server/config.yml"
+            - "/opt/sonatype/nexus-iq-server/bin/nexus-iq-server migrate-db /etc/nexus-iq-server/config.yml"
           securityContext:
             runAsUser: 1000
             runAsGroup: 1000

diff --git a/chart/tests/iq-server-jobs_test.yaml b/chart/tests/iq-server-jobs_test.yaml
@@ -35,7 +35,7 @@ tests:
                   - command:
                       - /bin/sh
                       - -c
-                      - /usr/bin/java -jar `ls ./nexus-iq-server*.jar` migrate-db /etc/nexus-iq-server/config.yml
+                      - /opt/sonatype/nexus-iq-server/bin/nexus-iq-server migrate-db /etc/nexus-iq-server/config.yml
                     env:
                     - name: NXIQ_DATABASE_HOSTNAME
                       valueFrom:
@@ -143,7 +143,7 @@ tests:
                   - command:
                     - /bin/sh
                     - -c
-                    - /usr/bin/java -jar `ls ./nexus-iq-server*.jar` migrate-db /etc/nexus-iq-server/config.yml
+                    - /opt/sonatype/nexus-iq-server/bin/nexus-iq-server migrate-db /etc/nexus-iq-server/config.yml
                     env:
                     - name: ENV_VAR_1
                       value: value1