Prepare tests for CS8

.gitlab-ci.yml

@@ -5,6 +5,7 @@ stages:
 variables:
   TEST_OS7: 'True'
   TEST_OS8: 'True'
+  TEST_OS8s: 'True'
   TEST_PHYSICAL: 'False'
   TEST_VIRTUAL: 'False'
   TEST_UNMANAGED: 'True'
@@ -21,3 +22,4 @@ include:
   # Specific customisations according to distro
   - local: '/ci/cc7.yml'
   - local: '/ci/c8.yml'
+  - local: '/ci/c8s.yml'

ci/c8s.yml

+cs8_unman_physical:
+  extends: .test_unmanaged_physical
+  variables:
+    OS: 8s
+  only:
+    variables:
+      - $TEST_OS8s == 'True' && $TEST_PHYSICAL == 'True' && $TEST_UNMANAGED == 'True'
+
+cs8_unman_virtual:
+  extends: .test_unmanaged_virtual
+  variables:
+    OS: 8s
+    DELETE_FAILURES: "False"
+  only:
+    variables:
+      - $TEST_OS8s == 'True' && $TEST_VIRTUAL == 'True' && $TEST_UNMANAGED == 'True'
+
+cs8_puppet_physical:
+  extends: .test_puppet_physical
+  variables:
+    OS: 8s
+  only:
+    variables:
+      - $TEST_OS8s == 'True' && $TEST_PHYSICAL == 'True' && $TEST_PUPPET == 'True'
+
+cs8_puppet_virtual:
+  extends: .test_puppet_virtual
+  variables:
+    OS: 8s
+  only:
+    variables:
+      - $TEST_OS8s == 'True' && $TEST_VIRTUAL == 'True' && $TEST_PUPPET == 'True'

ci/common.yml

@@ -18,7 +18,12 @@
 .get_latest_image: &get_latest_image
   - |
     if [[ -z "${IMAGE}" ]]; then
-      IMAGE=$(openstack image list --property os_distro_major="${OS}" --property os_edition="Base" --public --sort created_at -c ID -f value | tail -n1)
+      if [[ "${OS: -1}" -eq "s" ]]; then
+        SEARCH="--property os_distro="CS" --property os_distro_major=\"${OS:0:-1}\""
+      else
+        SEARCH="--property os_distro_major=\"${OS}\""
+      fi
+      IMAGE=$(openstack image list $SEARCH --property os_edition="Base" --public --sort created_at -c ID -f value | tail -n1)
     fi
 
 .test_unmanaged_physical: