From 3803fee03c606b803fd52d77d31ececfb3eb871c Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Thu, 23 Apr 2020 10:52:57 +0200 Subject: [PATCH 1/2] Add support for building for ubuntu 20.04 Focal. --- .gitlab-ci.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91b0261..c94fa27 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,6 +21,25 @@ build-debian-buster: - ./build.sh mp-dragonlab - cp *.deb build-buster +build-ubuntu-focal: + stage: build + image: ubuntu:focal + artifacts: + expire_in: 1d + paths: + - build-focal + script: + - apt-get update && apt-get upgrade -y + - apt-get install -y debhelper git curl apt-utils locales + - mkdir build-focal + - echo "Building for MP-UNINETT" + - ./build.sh mp-uninett + - cp *.deb build-focal + + - echo "Building for MP-DRAGONLAB" + - ./build.sh mp-dragonlab + - cp *.deb build-focal + deploy-apt: stage: deploy image: debian:buster @@ -28,6 +47,7 @@ deploy-apt: artifacts: paths: - build-buster + - build-focal script: - apt-get update && apt-get install openssh-client -y - ( @@ -38,4 +58,5 @@ deploy-apt: ) - ls -l build-*/*.deb - scp build-buster/*.deb jenkins@apt.uninett.no:/www/apt.uninett.no/htdocs/debian/pool/buster/main/all/ + - scp build-focal/*.deb jenkins@apt.uninett.no:/www/apt.uninett.no/htdocs/ubuntu/pool/focal/main/all/ - ssh jenkins@apt.uninett.no /www/apt.uninett.no/bin/mkrepo -- GitLab From 2f7173193d38d6a2eb15f9aa37dc982e5f792e80 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Thu, 23 Apr 2020 10:59:18 +0200 Subject: [PATCH 2/2] Remove interaction while installing tzdata --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c94fa27..84c180b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,7 @@ build-ubuntu-focal: - build-focal script: - apt-get update && apt-get upgrade -y - - apt-get install -y debhelper git curl apt-utils locales + - DEBIAN_FRONTEND=noninteractive apt-get install -y debhelper git curl apt-utils locales - mkdir build-focal - echo "Building for MP-UNINETT" - ./build.sh mp-uninett -- GitLab