From: David Galloway <dgallowa@redhat.com>
Date: Mon, 27 Apr 2020 18:01:23 +0000 (-0400)
Subject: ceph-dev*trigger: Build crimson on Focal instead of Bionic
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=aa47d7a8a7999ff02421abafa306708598218f2d;p=ceph-build.git

ceph-dev*trigger: Build crimson on Focal instead of Bionic

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
index 3d56b340..7cc698d8 100644
--- a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
+++ b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
@@ -158,7 +158,7 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=bionic
+                    DISTROS=focal
                     FLAVOR=crimson
 
     wrappers:
diff --git a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
index c4788468..5207f780 100644
--- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
+++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
@@ -140,7 +140,6 @@
       # build master on:
       # default: focal bionic centos7 centos8 leap15
       # notcmalloc: centos8
-      # crimson: bionic
       - conditional-step:
           condition-kind: regex-match
           regex: .*master.*
diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 34be8d0e..c124ef3e 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -590,13 +590,6 @@ use_ppa() {
                     use_ppa=true;;
                 xenial)
                     use_ppa=true;;
-                bionic)
-                    if [ "$FLAVOR" = "crimson" ]; then
-                        use_ppa=true
-                    else
-                        use_ppa=false
-                    fi
-                    ;;
                 *)
                     use_ppa=false;;
             esac