diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3930207..8928d83b 100644 --- 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 3a5f30db..bf316489 100644 --- 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 index 75683ee7..00000000 --- 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 $@