ci/cd - add empty .trivyignore and rename redhat to rhel
This commit is contained in:
parent
5c5dbcfc72
commit
7149a34cc5
|
@ -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)
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue