From bad076a403983a1527d8483359a5c9abd505bec7 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Mon, 31 Jan 2022 12:00:03 +0100
Subject: [PATCH 1/4] Support setting EDITION to something other than default
Base
---
ci/common.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ci/common.yml b/ci/common.yml
index 9a1f543..d3792ef 100644
--- a/ci/common.yml
+++ b/ci/common.yml
@@ -36,10 +36,11 @@
fi
fi
fi
- IMAGE=$(openstack image list --property os_distro="${OS_DISTRO}" --property os_distro_major="${OS_MAJOR}" --property architecture="${ARCH}" --property os_edition="Base" $OS_VISIBILITY --sort created_at -c ID -f value | tail -n1)
+ OS_EDITION="${EDITION:-Base}"
+ IMAGE=$(openstack image list --property os_distro="${OS_DISTRO}" --property os_distro_major="${OS_MAJOR}" --property architecture="${ARCH}" --property os_edition="${OS_EDITION}" $OS_VISIBILITY --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 architecture="${ARCH}" --property os_edition="Base" $OS_VISIBILITY --sort created_at
+ echo openstack image list --property os_distro="${OS_DISTRO}" --property os_distro_major="${OS_MAJOR}" --property architecture="${ARCH}" --property os_edition="${OS_EDITION}" $OS_VISIBILITY --sort created_at
exit 1
fi
else
--
GitLab
From 94cd158cdded90f05e1c567534a2d32e1b639d85 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Mon, 31 Jan 2022 12:00:32 +0100
Subject: [PATCH 2/4] Add a new test to build Test version of CentOS Stream 9
---
ci/c9s.yml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/ci/c9s.yml b/ci/c9s.yml
index cc4fdb1..17b3c86 100644
--- a/ci/c9s.yml
+++ b/ci/c9s.yml
@@ -38,3 +38,14 @@ cs9_puppet_virtual:
variables:
- $TEST_OS9 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_PUPPET == 'True'
allow_failure: true
+
+cs9_test_puppet_virtual:
+ extends: .test_puppet_virtual
+ variables:
+ OS: 9s
+ EDITION: Test
+ ARCH: x96_64
+ only:
+ variables:
+ - $TEST_OS9 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_PUPPET == 'True'
+ allow_failure: true
--
GitLab
From 2c750d0d3bd5db4b1041a90d126a78005c8a8a05 Mon Sep 17 00:00:00 2001
From: Alex Iribarren <alex.iribarren@cern.ch>
Date: Mon, 31 Jan 2022 14:06:35 +0100
Subject: [PATCH 3/4] Add EDITION variable to existing jobs
---
ci/c9s.yml | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/ci/c9s.yml b/ci/c9s.yml
index 17b3c86..a04d640 100644
--- a/ci/c9s.yml
+++ b/ci/c9s.yml
@@ -3,6 +3,7 @@ cs9_unman_physical:
variables:
OS: 9s
ARCH: x96_64
+ EDITION: Test
only:
variables:
- $TEST_OS9 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_UNMANAGED == 'True'
@@ -14,6 +15,7 @@ cs9_unman_virtual:
OS: 9s
ARCH: x96_64
DELETE_FAILURES: "False"
+ EDITION: Test
only:
variables:
- $TEST_OS9 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_UNMANAGED == 'True'
@@ -24,6 +26,7 @@ cs9_puppet_physical:
variables:
OS: 9s
ARCH: x96_64
+ EDITION: Test
only:
variables:
- $TEST_OS9 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_PUPPET == 'True'
@@ -34,17 +37,7 @@ cs9_puppet_virtual:
variables:
OS: 9s
ARCH: x96_64
- only:
- variables:
- - $TEST_OS9 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_PUPPET == 'True'
- allow_failure: true
-
-cs9_test_puppet_virtual:
- extends: .test_puppet_virtual
- variables:
- OS: 9s
EDITION: Test
- ARCH: x96_64
only:
variables:
- $TEST_OS9 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_PUPPET == 'True'
--
GitLab
From 2b7b96fb6ff5bbc2c4c82c091b7d2b2ec0d751c3 Mon Sep 17 00:00:00 2001
From: Alex Iribarren <alex.iribarren@cern.ch>
Date: Mon, 31 Jan 2022 14:10:00 +0100
Subject: [PATCH 4/4] x96_64 is not supported yet
---
ci/c9s.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ci/c9s.yml b/ci/c9s.yml
index a04d640..d759e9d 100644
--- a/ci/c9s.yml
+++ b/ci/c9s.yml
@@ -2,7 +2,7 @@ cs9_unman_physical:
extends: .test_unmanaged_physical
variables:
OS: 9s
- ARCH: x96_64
+ ARCH: x86_64
EDITION: Test
only:
variables:
@@ -13,7 +13,7 @@ cs9_unman_virtual:
extends: .test_unmanaged_virtual
variables:
OS: 9s
- ARCH: x96_64
+ ARCH: x86_64
DELETE_FAILURES: "False"
EDITION: Test
only:
@@ -25,7 +25,7 @@ cs9_puppet_physical:
extends: .test_puppet_physical
variables:
OS: 9s
- ARCH: x96_64
+ ARCH: x86_64
EDITION: Test
only:
variables:
@@ -36,7 +36,7 @@ cs9_puppet_virtual:
extends: .test_puppet_virtual
variables:
OS: 9s
- ARCH: x96_64
+ ARCH: x86_64
EDITION: Test
only:
variables:
--
GitLab