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 ce79ea747cf25552fb9ed4552262506b095ce714..39ef024c065185d559dc287c21ea2a92acdebc2d 100644 (file)
--- 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 6867b7b53e4b2bf895c225937962dfe02c3ea85a..d0ca9c66ae086a3dc2720c4c1cbfb9b450c12839 100644 (file)
--- 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 5639f1c2200f7a98b5ce364403db710a27224636..1ca399475c5e69fcd2b570d0ca7e8d718c8ea42c 100644 (file)
--- 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;;