From: Kefu Chai <tchaikov@gmail.com>
Date: Tue, 12 Dec 2017 03:44:59 +0000 (+0800)
Subject: ceph-dev-{,new-}trigger: add FLAVOR=notcmalloc back
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a13e43401dff61ec5d0e705d76bde70ead72a900;p=ceph-build.git

ceph-dev-{,new-}trigger: add FLAVOR=notcmalloc back

it's a regression introduced by 3a0b799b

Signed-off-by: Kefu Chai <tchaikov@gmail.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 fa1249d3b..ce79ea747 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
@@ -47,6 +47,7 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
+                    FLAVOR=notcmalloc
       - conditional-step:
           condition-kind: shell
           condition-command: |
diff --git a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
index 08a73088c..6867b7b53 100644
--- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
+++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
@@ -56,6 +56,7 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
+                    FLAVOR=notcmalloc
       - conditional-step:
           condition-kind: shell
           condition-command: |