Skip to content
Snippets Groups Projects
Verified Commit 93d3b348 authored by Alex Iribarren's avatar Alex Iribarren
Browse files

Deal correctly with multiple arches

parent 01454951
No related branches found
No related tags found
No related merge requests found
Pipeline #2644684 passed
......@@ -2,6 +2,7 @@ c8_unman_physical:
extends: .test_unmanaged_physical
variables:
OS: 8
ARCH: x86_64
only:
variables:
- $TEST_OS8 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_UNMANAGED == 'True'
......@@ -10,6 +11,7 @@ c8_unman_virtual:
extends: .test_unmanaged_virtual
variables:
OS: 8
ARCH: x86_64
DELETE_FAILURES: "False"
only:
variables:
......@@ -19,6 +21,7 @@ c8_puppet_physical:
extends: .test_puppet_physical
variables:
OS: 8
ARCH: x86_64
only:
variables:
- $TEST_OS8 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_PUPPET == 'True'
......@@ -27,6 +30,7 @@ c8_puppet_virtual:
extends: .test_puppet_virtual
variables:
OS: 8
ARCH: x86_64
only:
variables:
- $TEST_OS8 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_PUPPET == 'True'
......@@ -2,6 +2,7 @@ cs8_unman_physical:
extends: .test_unmanaged_physical
variables:
OS: 8s
ARCH: x86_64
only:
variables:
- $TEST_OS8s == 'True' && $TEST_PHYSICAL == 'True' && $TEST_UNMANAGED == 'True'
......@@ -10,6 +11,7 @@ cs8_unman_virtual:
extends: .test_unmanaged_virtual
variables:
OS: 8s
ARCH: x86_64
DELETE_FAILURES: "False"
only:
variables:
......@@ -19,6 +21,7 @@ cs8_puppet_physical:
extends: .test_puppet_physical
variables:
OS: 8s
ARCH: x86_64
only:
variables:
- $TEST_OS8s == 'True' && $TEST_PHYSICAL == 'True' && $TEST_PUPPET == 'True'
......@@ -27,6 +30,7 @@ cs8_puppet_virtual:
extends: .test_puppet_virtual
variables:
OS: 8s
ARCH: x86_64
only:
variables:
- $TEST_OS8s == 'True' && $TEST_VIRTUAL == 'True' && $TEST_PUPPET == 'True'
......@@ -2,6 +2,7 @@ cc7_unman_physical:
extends: .test_unmanaged_physical
variables:
OS: 7
ARCH: x86_64
only:
variables:
- $TEST_OS7 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_UNMANAGED == 'True'
......@@ -10,6 +11,7 @@ cc7_unman_virtual:
extends: .test_unmanaged_virtual
variables:
OS: 7
ARCH: x86_64
DELETE_FAILURES: "False"
only:
variables:
......@@ -19,6 +21,7 @@ cc7_puppet_physical:
extends: .test_puppet_physical
variables:
OS: 7
ARCH: x86_64
only:
variables:
- $TEST_OS7 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_PUPPET == 'True'
......@@ -27,6 +30,7 @@ cc7_puppet_virtual:
extends: .test_puppet_virtual
variables:
OS: 7
ARCH: x86_64
only:
variables:
- $TEST_OS7 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_PUPPET == 'True'
......@@ -29,10 +29,10 @@
OS_DISTRO="C"
fi
fi
IMAGE=$(openstack image list --property os_distro="${OS_DISTRO}" --property os_distro_major="${OS_MAJOR}" --property os_edition="Base" --public --sort created_at -c ID -f value | tail -n1)
IMAGE=$(openstack image list --property os_distro="${OS_DISTRO}" --property os_distro_major="${OS_MAJOR}" --property architecture="${ARCH}" --property os_edition="Base" --public --sort created_at -c ID -f value | tail -n1)
if [[ -z "${IMAGE}" ]]; then
echo "No image found matching:"
echo openstack image list --property os_distro="${OS_DISTRO}" --property os_distro_major="${OS_MAJOR}" --property os_edition="Base" --public --sort created_at
echo openstack image list --property os_distro="${OS_DISTRO}" --property os_distro_major="${OS_MAJOR}" --property architecture="${ARCH}" --property os_edition="Base" --public --sort created_at
exit 1
fi
fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment