ci: Add Ubuntu 20.04 test environments.

.gitlab-ci.yml

@@ -20,6 +20,12 @@ variables:
     FDO_DISTRIBUTION_VERSION: buster
     FDO_DISTRIBUTION_TAG: "2020-05-06.1"
 
+# Variables for build and usage of Ubuntu 20.04 LTS (Focal) image
+.monado.ubuntu:focal:
+  variables:
+    FDO_DISTRIBUTION_VERSION: "20.04"
+    FDO_DISTRIBUTION_TAG: "2020-05-06.0"
+
 # Variables for build and usage of Debian 10 (Buster) + Android NDK image
 .monado.debian:buster-ndk:
   variables:
@@ -36,6 +42,9 @@ include:
   - project: "freedesktop/ci-templates"
     ref: *templates_sha
     file: "/templates/debian.yml"
+  - project: "freedesktop/ci-templates"
+    ref: *templates_sha
+    file: "/templates/ubuntu.yml"
   - project: "freedesktop/ci-templates"
     ref: *templates_sha
     file: "/templates/arch.yml"
@@ -82,6 +91,17 @@ arch:container_prep:
     # a list of packages to install
     FDO_DISTRIBUTION_PACKAGES: "git gcc cmake meson ninja pkgconfig python3 diffutils patch doxygen graphviz eigen hidapi libxrandr mesa glslang vulkan-headers vulkan-icd-loader check glfw-x11 libusb opencv gtk3 ffmpeg v4l-utils qt5-base"
 
+ubuntu:container_prep:
+  stage: container_prep
+  extends:
+    - .monado.ubuntu:focal # local - variables
+    - .monado.container_base # local
+    - .monado.debian-based-packages # local - variables
+    - .fdo.container-build@ubuntu # from ci-templates
+  variables:
+    # a list of packages to install - assembled from .monado.debian-based-packages
+    FDO_DISTRIBUTION_PACKAGES: "${CORE_REQUIRED_PACKAGES} ${FEATURE_PACKAGES} ${TOOLS_REQUIRED_PACKAGES}"
+
 # Debian Buster + the Android NDK in /opt/android-ndk
 # The NDK itself gets installed by .gitlab-ci/ndk:container_prep.sh
 ndk:container_prep:
@@ -172,12 +192,24 @@ arch:cmake:
     - .fdo.distribution-image@arch # from ci-templates
     - .monado.build-cmake # local
 
+ubuntu:cmake:
+  extends:
+    - .monado.ubuntu:focal # local
+    - .fdo.distribution-image@ubuntu # from ci-templates
+    - .monado.build-cmake # local
+
 debian:meson:
   extends:
     - .monado.debian:buster # local
     - .fdo.distribution-image@debian # from ci-templates
     - .monado.build-meson # local
 
+ubuntu:meson:
+  extends:
+    - .monado.ubuntu:focal # local
+    - .fdo.distribution-image@ubuntu # from ci-templates
+    - .monado.build-meson # local
+
 arch:meson:
   extends:
     - .monado.arch:rolling # local

.gitlab-ci/ubuntu:container_prep.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+(
+    cd $(dirname $0)
+    bash ./build-openxr-openhmd.sh
+)