Merge pull request #99 from aali309/testWithForkedMain14

feat(ci): testing14

.github/workflows/ci-build-image.yml

@@ -1,3 +1,5 @@
+name: build cryostat image
+
 on:
   workflow_call:
     inputs:
@@ -10,10 +12,6 @@ on:
       build-arch:
         required: true
         type: string
-      run-tests-only:
-        required: false
-        type: boolean
-        default: false
     outputs:
       image-version:
         description: the Cryostat application version that will be built
@@ -42,11 +40,8 @@ jobs:
 
   build-image:
     runs-on: ubuntu-latest
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     permissions:
       pull-requests: write
-    if: ${{ !inputs.run-tests-only }}
     needs: [get-pom-properties]
     steps:
     - name: Install qemu
@@ -56,7 +51,6 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y qemu-user-static
     - uses: actions/checkout@v4
-      if: always()
       with:
         repository: ${{ inputs.checkout-repo }}
         ref: ${{ inputs.checkout-ref }}
@@ -69,8 +63,13 @@ jobs:
     - name: maven-settings
       uses: s4u/maven-settings-action@v2
       with:
-        servers: '[{"id": "github", "username": "dummy", "password": "${env.GITHUB_TOKEN}"}]'
         githubServer: true
+    - name: ghcr login
+      uses: redhat-actions/podman-login@v1
+      with:
+        registry: ghcr.io/${{ github.repository_owner }}
+        username: ${{ github.event.comment.user.login }}
+        password: ${{ secrets.GITHUB_TOKEN }}
     - uses: skjolber/maven-cache-github-action@v1
       with:
         step: restore

.github/workflows/integrated-test.yml

@@ -45,7 +45,7 @@ jobs:
         sudo apt-get install -y qemu-user-static
     - uses: actions/checkout@v4
       with:
-          repository: ${{ github.repository_owner }}/cryostat
+          repository: ${{ inputs.checkout-repo }}
           ref: ${{ inputs.checkout-ref }}
           submodules: true
           fetch-depth: 0

.github/workflows/pr-ci.yml

@@ -186,6 +186,7 @@ jobs:
       build-arch: ${{ matrix.arch }}
       pr-number: ${{ github.event.issue.number }}
       sha-value: ${{ needs.checkout-branch.outputs.PR_head_sha }}
+      skip-itests: ${{ matrix.arch == 'arm64' }}
 
   retest-integration:
     needs: [checkout-branch]
@@ -198,6 +199,7 @@ jobs:
       build-arch: ${{ matrix.arch }}
       pr-number: ${{ github.event.issue.number }}
       sha-value: ${{ needs.checkout-branch.outputs.PR_head_sha }}
+      skip-itests: ${{ matrix.arch == 'arm64' }}
 
   integration-test-pass:
     runs-on: ubuntu-latest

pom.xml

@@ -67,7 +67,7 @@
 
   <io.reactiverse.plugin.version>1.0.27</io.reactiverse.plugin.version>
   <org.apache.maven.plugins.compiler.version>3.11.0</org.apache.maven.plugins.compiler.version>
-  <org.apache.maven.plugins.surefire.version>3.1.2</org.apache.maven.plugins.surefire.version>
+  <org.apache.maven.plugins.surefire.version>3.2.1</org.apache.maven.plugins.surefire.version>
   <org.apache.maven.plugins.failsafe.version>${org.apache.maven.plugins.surefire.version}</org.apache.maven.plugins.failsafe.version>
   <org.apache.maven.plugins.site.version>3.12.1</org.apache.maven.plugins.site.version>
   <org.apache.maven.plugins.info.reports.version>3.4.5</org.apache.maven.plugins.info.reports.version>
@@ -78,7 +78,7 @@
   <org.codehaus.mojo.exec.plugin.version>3.1.0</org.codehaus.mojo.exec.plugin.version>
   <org.codehaus.mojo.build.helper.plugin.version>3.4.0</org.codehaus.mojo.build.helper.plugin.version>
   <com.mycila.license.maven.plugin.version>4.3</com.mycila.license.maven.plugin.version>
-  <org.owasp.dependency.check.version>8.4.0</org.owasp.dependency.check.version>
+  <org.owasp.dependency.check.version>8.4.2</org.owasp.dependency.check.version>
   <com.google.cloud.tools.jib.maven.plugin.version>3.4.0</com.google.cloud.tools.jib.maven.plugin.version>
 
   <!-- Use a separate property for dependency alignment purposes. -->

src/container/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.17-1.1696520331
+FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.17-2
 
 USER root