From 444ea5618275a6f42806fe086a240c0294da8b28 Mon Sep 17 00:00:00 2001
From: manojsdoshi <mdoshi@ripple.com>
Date: Mon, 27 Apr 2020 11:44:05 -0700
Subject: [PATCH] Adding support to build rippled packages for ubuntu 20.04

---
 Builds/containers/gitlab-ci/pkgbuild.yml         | 16 ++++++++--------
 .../containers/gitlab-ci/push_to_artifactory.sh  |  2 +-
 .../containers/gitlab-ci/verify_head_commit.sh   |  1 +
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Builds/containers/gitlab-ci/pkgbuild.yml b/Builds/containers/gitlab-ci/pkgbuild.yml
index 6e2b88e26..2ab10852d 100644
--- a/Builds/containers/gitlab-ci/pkgbuild.yml
+++ b/Builds/containers/gitlab-ci/pkgbuild.yml
@@ -212,13 +212,13 @@ fedora_27_smoketest:
 ## this one is not LTS, but we
 ## get some extra coverage by including it
 ## consider dropping it when 20.04 is ready
-ubuntu_19_smoketest:
+ubuntu_20_smoketest:
   stage: smoketest
   dependencies:
     - dpkg_build
     - dpkg_sign
   image:
-    name: ubuntu:19.10
+    name: ubuntu:20.04
   <<: *run_local_smoketest
 
 ubuntu_18_smoketest:
@@ -375,13 +375,13 @@ fedora_27_verify_repo_test:
   <<: *only_primary
   <<: *run_repo_smoketest
 
-ubuntu_19_verify_repo_test:
+ubuntu_20_verify_repo_test:
   stage: verify_from_test
   variables:
-    DISTRO: "eoan"
+    DISTRO: "focal"
     DEB_REPO: "rippled-deb-test-mirror"
   image:
-    name: ubuntu:19.10
+    name: ubuntu:20.04
   dependencies:
     - dpkg_sign
   <<: *only_primary
@@ -521,13 +521,13 @@ fedora_27_verify_repo_prod:
   <<: *only_primary
   <<: *run_repo_smoketest
 
-ubuntu_19_verify_repo_prod:
+ubuntu_20_verify_repo_prod:
   stage: verify_from_prod
   variables:
-    DISTRO: "eoan"
+    DISTRO: "focal"
     DEB_REPO: "rippled-deb"
   image:
-    name: ubuntu:19.10
+    name: ubuntu:20.04
   dependencies:
     - dpkg_sign
   <<: *only_primary
diff --git a/Builds/containers/gitlab-ci/push_to_artifactory.sh b/Builds/containers/gitlab-ci/push_to_artifactory.sh
index a52227cbe..53d87b339 100644
--- a/Builds/containers/gitlab-ci/push_to_artifactory.sh
+++ b/Builds/containers/gitlab-ci/push_to_artifactory.sh
@@ -19,7 +19,7 @@ RIPPLED_DBG_PKG=$(ls rippled-dbgsym_*.deb)
 # TODO - where to upload src tgz?
 RIPPLED_SRC=$(ls rippled_*.orig.tar.gz)
 DEB_MATRIX=";deb.component=${COMPONENT};deb.architecture=amd64"
-for dist in stretch buster xenial bionic disco ; do
+for dist in stretch buster xenial bionic disco focal ; do
     DEB_MATRIX="${DEB_MATRIX};deb.distribution=${dist}"
 done
 echo "{ \"debs\": {" > "${TOPDIR}/files.info"
diff --git a/Builds/containers/gitlab-ci/verify_head_commit.sh b/Builds/containers/gitlab-ci/verify_head_commit.sh
index b2b5ec125..f724b7e96 100644
--- a/Builds/containers/gitlab-ci/verify_head_commit.sh
+++ b/Builds/containers/gitlab-ci/verify_head_commit.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env sh
 set -ex
 apt -y update
+DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
 apt -y install software-properties-common curl git gnupg
 curl -sk -o rippled-pubkeys.txt "${GIT_SIGN_PUBKEYS_URL}"
 gpg --import rippled-pubkeys.txt