From: Kefu Chai <kchai@redhat.com>
Date: Thu, 1 Mar 2018 12:02:28 +0000 (+0800)
Subject: ceph-dev{,-new}-trigger: do build kraken w/o ppa and on trusty
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d703f592cc0a09c1107d11174afc1301924f01a1;p=ceph-build.git

ceph-dev{,-new}-trigger: do build kraken w/o ppa and on trusty

Signed-off-by: Kefu Chai <kchai@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 ce79ea74..39ef024c 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
@@ -30,7 +30,7 @@
     builders:
       - conditional-step:
           condition-kind: regex-match
-          regex: .*(jewel|luminous).*
+          regex: .*(jewel|kraken|luminous).*
           label: '${GIT_BRANCH}'
           on-evaluation-failure: dont-run
           steps:
@@ -51,7 +51,7 @@
       - conditional-step:
           condition-kind: shell
           condition-command: |
-            echo "${GIT_BRANCH}" | grep -v '\(jewel\|luminous\)'
+            echo "${GIT_BRANCH}" | grep -v '\(jewel\|kraken\|luminous\)'
           on-evaluation-failure: dont-run
           steps:
             - shell:
diff --git a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
index 6867b7b5..d0ca9c66 100644
--- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
+++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
@@ -39,7 +39,7 @@
     builders:
       - conditional-step:
           condition-kind: regex-match
-          regex: .*(jewel|luminous).*
+          regex: .*(jewel|kraken|luminous).*
           label: '${GIT_BRANCH}'
           on-evaluation-failure: dont-run
           steps:
@@ -60,7 +60,7 @@
       - conditional-step:
           condition-kind: shell
           condition-command: |
-            echo "${GIT_BRANCH}" | grep -v '\(jewel\|luminous\)'
+            echo "${GIT_BRANCH}" | grep -v '\(jewel\|kraken\|luminous\)'
           on-evaluation-failure: dont-run
           steps:
             - shell:
diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 5639f1c2..1ca39947 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -431,6 +431,9 @@ use_ppa() {
         10.*)
             # jewel
             use_ppa=false;;
+        11.*)
+            # kraken
+            use_ppa=false;;
         12.*)
             # luminous
             use_ppa=false;;