address PR comments

Author: bertiethorpe

.github/workflows/fatimage.yml

@@ -34,7 +34,6 @@ jobs:
       ANSIBLE_FORCE_COLOR: True
       OS_CLOUD: openstack
       CI_CLOUD: ${{ github.event.inputs.ci_cloud }}
-      BUILD: "${{ matrix.build }}-${{ matrix.os_version }}"
 
     steps:
       - uses: actions/checkout@v2
@@ -108,7 +107,7 @@ jobs:
       - name: Upload manifest artifact
         uses: actions/upload-artifact@v4
         with:
-          name: image-details-${{ env.BUILD }}
+          name: image-details-"${{ matrix.build }}-${{ matrix.os_version }}"
           path: |
             ./image-id.txt
             ./image-name.txt

.github/workflows/nightlybuild.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false # allow other matrix jobs to continue even if one fails
-      matrix: # build RL8+OFED, RL9+OFED, RL9+OFED+CUDA versions
+      matrix: # build RL8, RL9, RL9+CUDA versions
         os_version:
           - RL8
           - RL9
@@ -157,7 +157,7 @@ jobs:
         if: failure() && steps.packer_build.outcome == 'success' # Runs if the Trivy scan found crit vulnerabilities or failed
         run: |
           . venv/bin/activate
-          echo "Deleting new image due to critical vulnerabilities..."
+          echo "Deleting new image due to critical vulnerabilities or scan failure ..."
           openstack image delete "${{ steps.manifest.outputs.image-id }}"
 
       - name: Delete old latest image

.github/workflows/trivyscan.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - main
-      - master
     paths:
       - 'environments/.stackhpc/terraform/cluster_image.auto.tfvars.json'
 

ansible/bootstrap.yml

@@ -148,7 +148,7 @@
   tags: cockpit
   tasks:
     - name: Remove RHEL cockpit
-      command: dnf -y remove cockpit-ws
+      command: dnf -y remove cockpit-ws # N.B. using ansible dnf module is very slow
       register: dnf_remove_output
       ignore_errors: true  # Avoid failing if a lock or other error happens