add more options/flags to fine-control ceph-deploy release

Signed-off-by: Alfredo Deza <adeza@redhat.com>

diff --git a/ceph-deploy/config/definitions/ceph-deploy.yml b/ceph-deploy/config/definitions/ceph-deploy.yml
index 078d21c222cae025b23cadfa841913bbf4e5bc49..1c169d37a4189fc3ea858312071d4f0af54004c9 100644 (file)
--- a/ceph-deploy/config/definitions/ceph-deploy.yml
+++ b/ceph-deploy/config/definitions/ceph-deploy.yml
@@ -13,11 +13,8 @@
     parameters:
       - string:
           name: BRANCH
-          description: "The git branch or tag to build"
-
-      - bool:
-          name: RELEASE
-          description: "If checked, it will use the key for releases, otherwise it will use the autosign one."
+          description: "The git branch or tag to build. Defaults to master"
+          default: "master"
 
       - bool:
           name: TEST
@@ -26,6 +23,12 @@ If this is unchecked, then the builds will be pushed to chacra with the correct
 
 If this is checked, then the builds will be pushed to chacra under the 'test' ref."
 
+      - bool:
+          name: TAG
+          description: "When this is checked, Jenkins will remove the previous tag and recreate it again, changing the control files and committing again. When this is unchecked, Jenkins will not do any commit or tag operations. If you've already created the private tag separately, then leave this unchecked.
+Defaults to checked."
+          default: true
+
       - bool:
           name: FORCE
           description: "
@@ -33,6 +36,10 @@ If this is unchecked, then then nothing is built or pushed if they already exist
 
 If this is checked, then the binaries will be built and pushed to chacra even if they already exist in chacra."
 
+      - string:
+          name: VERSION
+          description: "The version for release, e.g. 0.94.4"
+
     scm:
       - git:
           url: https://github.com/ceph/ceph-deploy.git
@@ -61,6 +68,14 @@ If this is checked, then the binaries will be built and pushed to chacra even if
             - centos7
 
     builders:
+      - multijob:
+          name: 'ceph-deploy tag phase'
+          condition: SUCCESSFUL
+          projects:
+            - name: ceph-deploy-tag
+              current-parameters: true
+              exposed-scm: false
+
       - shell:
             !include-raw:
               - ../../../scripts/build_utils.sh