ci/cd - add empty .trivyignore and rename redhat to rhel

DitZii · Mar 3, 2023 · 7149a34 · 7149a34
1 parent 5c5dbcf
commit 7149a34
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/staging-tests.yml b/.github/workflows/staging-tests.yml
@@ -69,9 +69,9 @@ jobs:
       - name: Pull BW linux fedora test image
         if: inputs.TYPE == 'linux'
         run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/fedora-tests:staging && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/fedora-tests:staging local/fedora:latest
-      - name: Pull BW linux redhat test image
+      - name: Pull BW linux rhel test image
         if: inputs.TYPE == 'linux'
-        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/redhat-tests:staging && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/redhat-tests:staging local/redhat:latest
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/rhel-tests:staging && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/rhel-tests:staging local/rhel:latest
       # Do tests
       - name: Run tests
         if: contains(fromJSON('["docker", "autoconf", "swarm"]'), inputs.TYPE)

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -89,10 +89,10 @@ jobs:
       DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
       PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
       PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
-  build-redhat:
+  build-rhel:
     uses: ./.github/workflows/staging-linux-build.yml
     with:
-      LINUX: redhat
+      LINUX: rhel
       PACKAGE: rpm
     secrets:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
@@ -326,7 +326,7 @@ jobs:
       PACKAGE: deb
     secrets:
       PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
-  push-redhat:
+  push-rhel:
     needs: [tests-linux]
     uses: ./.github/workflows/staging-push-packagecloud.yml
     with:

diff --git a/.trivyignore b/.trivyignore