LOS-793: Get cloud-init logs as artifacts

ci/common.yml

@@ -10,7 +10,8 @@
   artifacts:
     when: always
     paths:
-      - _junit/result.xml
+      - "_junit/result.xml"
+      - "*cloud-init-output.log"
     reports:
       junit: _junit/result.xml
 
@@ -43,6 +44,7 @@
       fi
     else
       OS_DISTRO=$(openstack image show ${IMAGE} -c properties -f json | jq '.properties.os_distro' | tr -d \")
+      OS_MAJOR=$(openstack image show ${IMAGE} -c properties -f json | jq '.properties.os_distro_major' | tr -d \")
     fi
 
 .test_unmanaged_physical:
@@ -50,8 +52,8 @@
   script:
     - export OS_PROJECT_NAME="${PROJECT_PHYSICAL}"
     - *get_latest_image
-    - echo bash testallthethings.sh -d "${OS_DISTRO}" -i "${IMAGE}" -f "${FLAVOR}"
-    - bash testallthethings.sh -d "${OS_DISTRO}" -i "${IMAGE}" -f "${FLAVOR}"
+    - echo bash testallthethings.sh -d "${OS_DISTRO}" -m "${OS_MAJOR}" -i "${IMAGE}" -f "${FLAVOR}"
+    - bash testallthethings.sh -d "${OS_DISTRO}" -m "${OS_MAJOR}" -i "${IMAGE}" -f "${FLAVOR}"
   allow_failure: true
 
 .test_unmanaged_virtual:
@@ -59,8 +61,8 @@
   script:
     - export OS_PROJECT_NAME="${PROJECT_VIRTUAL}"
     - *get_latest_image
-    - echo bash testallthethings.sh -d "${OS_DISTRO}" -i "${IMAGE}" -f "m2.small"
-    - bash testallthethings.sh -d "${OS_DISTRO}" -i "${IMAGE}" -f "m2.small"
+    - echo bash testallthethings.sh -d "${OS_DISTRO}" -m "${OS_MAJOR}" -i "${IMAGE}" -f "m2.small"
+    - bash testallthethings.sh -d "${OS_DISTRO}" -m "${OS_MAJOR}" -i "${IMAGE}" -f "m2.small"
 
 .test_puppet_physical:
   extends: .openstack
@@ -71,8 +73,8 @@
     - export OS_PROJECT_NAME="${PROJECT_PHYSICAL}"
     - *get_latest_image
     - yum install -y openssh-clients jq
-    - echo bash testallthethings.sh -d "${OS_DISTRO}" -i "${IMAGE}" -f "${FLAVOR}" -p
-    - bash testallthethings.sh -d "${OS_DISTRO}" -i "${IMAGE}" -f "${FLAVOR}" -p
+    - echo bash testallthethings.sh -d "${OS_DISTRO}" -m "${OS_MAJOR}" -i "${IMAGE}" -f "${FLAVOR}" -p
+    - bash testallthethings.sh -d "${OS_DISTRO}" -m "${OS_MAJOR}" -i "${IMAGE}" -f "${FLAVOR}" -p
   allow_failure: true
 
 .test_puppet_virtual:
@@ -84,5 +86,5 @@
     - export OS_PROJECT_NAME="${PROJECT_VIRTUAL}"
     - *get_latest_image
     - yum install -y openssh-clients jq
-    - echo bash testallthethings.sh -d "${OS_DISTRO}" -i "${IMAGE}" -f "m2.small" -p
-    - bash testallthethings.sh -d "${OS_DISTRO}" -i "${IMAGE}" -f "m2.small" -p
+    - echo bash testallthethings.sh -d "${OS_DISTRO}" -m "${OS_MAJOR}" -i "${IMAGE}" -f "m2.small" -p
+    - bash testallthethings.sh -d "${OS_DISTRO}" -m "${OS_MAJOR}" -i "${IMAGE}" -f "m2.small" -p