fix variables

This commit is contained in:
Neil Hanlon 2022-10-12 01:09:14 -04:00
parent 7452bc7c40
commit ef48e489ea
Signed by: neil
GPG Key ID: 705BC21EC3C70F34

View File

@ -25,22 +25,21 @@ jobs:
- s390x - s390x
- ppc64le - ppc64le
version: version:
- 8 - major: 8
- 9 minor: 6
- major: 9
minor: 0
type: type:
- name: 'Container' - name: Container
variant: variant: Base
- Base - name: Container
- name: 'Container' variant: Minimal
variant: - name: Container
- Minimal variant: UBI
- name: 'Container' - name: GenericCloud
variant: - name: EC2
- UBI - name: Azure
- name: 'GenericCloud' - name: OCP
- name: 'EC2'
- name: 'Azure'
- name: 'OCP'
exclude: exclude:
- architecture: s390x - architecture: s390x
version: 8 version: 8
@ -56,8 +55,8 @@ jobs:
IMAGE: ghcr.io/rocky-linux/empanadas-imagefactory:latest IMAGE: ghcr.io/rocky-linux/empanadas-imagefactory:latest
LIBVIRT_DEFAULT_URI: LIBVIRT_DEFAULT_URI:
run: | run: |
export VARIANTS="$(test -z '${{ matrix.type.variant }}' && '' || '--variant ${{ matrix.type.variant }}')" export VARIANT_ARGS="$(test -z '${{ matrix.type.variant }}' && '' || '--variant ${{ matrix.type.variant }}')"
export CMD="build-image --version ${{ matrix.version.major }} --type ${{ matrix.type.name }} ${VARIANTS}" export CMD="build-image --version ${{ matrix.version.major }} --type ${{ matrix.type.name }} ${VARIANT_ARGS}"
sudo podman run --rm --privileged --security-opt label=disable --device fuse \ sudo podman run --rm --privileged --security-opt label=disable --device fuse \
-v /var/run/libvirt:/var/run/libvirt:rw -v /var/lib/imagefactory:/var/lib/imagefactory:rw \ -v /var/run/libvirt:/var/run/libvirt:rw -v /var/lib/imagefactory:/var/lib/imagefactory:rw \
$CMD $CMD