gitlab CI: remove unused custom ubuntu install script

Looks like this has been obsolete since
4df2ac731ff3ae420081b3e243fc2cec636bdfd6 where it stopped passing in the
packages.

And a bug caused the template to checked the "version" against "ubuntu", so
the script hasn't actually been included in any job anyway.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c393020..8928d83 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,8 +96,6 @@ variables:
   FREEBSD_TAG: '2020-11-09.0'
   QEMU_TAG:    'qemu-vm-2020-11-09.0'
 
-  UBUNTU_EXEC: "bash .gitlab-ci/ubuntu_install.sh $UBUNTU_CUSTOM_DEBS"
-
   FREEBSD_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/11.2:$FREEBSD_TAG
   FDO_UPSTREAM_REPO: libinput/libinput
 

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 3a5f30d..bf31648 100644 (file)
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -87,8 +87,6 @@ variables:
 {% endif %}
 {% endfor %}
 
-  UBUNTU_EXEC: "bash .gitlab-ci/ubuntu_install.sh $UBUNTU_CUSTOM_DEBS"
-
   FREEBSD_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/11.2:$FREEBSD_TAG
   FDO_UPSTREAM_REPO: libinput/libinput
 
@@ -215,9 +213,6 @@ check-merge-request:
     FDO_DISTRIBUTION_VERSION: '{{version}}'
     FDO_DISTRIBUTION_PACKAGES: ${{distro.name.upper()}}_PACKAGES
     FDO_DISTRIBUTION_TAG: ${{distro.name.upper()}}_TAG
- {% if version == 'ubuntu'%}
-    FDO_DISTRIBUTION_EXEC: $UBUNTU_EXEC
- {% endif %}
 
 {% endfor %}
 {% endfor %}

diff --git a/.gitlab-ci/ubuntu_install.sh b/.gitlab-ci/ubuntu_install.sh
deleted file mode 100644 (file)
index 75683ee..0000000
--- a/.gitlab-ci/ubuntu_install.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-export DEBIAN_FRONTEND=noninteractive
-
-apt-get install -y software-properties-common
-add-apt-repository universe
-apt-get update
-apt-get -y upgrade
-
-apt-get install -y $@