ceph-dev-pipeline: Add CHACRA_UPLOAD parameter

This logic was chosen to preserve the logic the THROWAWAY parameter
provides regardless of package repository choice.

Signed-off-by: David Galloway <david.galloway@ibm.com>

diff --git a/ceph-dev-pipeline/build/Jenkinsfile b/ceph-dev-pipeline/build/Jenkinsfile
index 4ee709091568ccbe11b53adf75c7dd5805eb5196..005652af69bc9c015fdcac2414d156f06df06016 100644 (file)
--- a/ceph-dev-pipeline/build/Jenkinsfile
+++ b/ceph-dev-pipeline/build/Jenkinsfile
@@ -460,7 +460,7 @@ def doUploadPackagesStage() {
     export OS_VERSION="${os.version}"
     export OS_VERSION_NAME="${os.version_name}"
     export OS_PKG_TYPE="${os.pkg_type}"
-    if [ "${env.THROWAWAY}" != "true" ]; then ./scripts/chacra_upload.sh; fi
+    if [ "${env.THROWAWAY}" != "true" ] && [ "${env.CHACRA_UPLOAD}" == "true" ]; then ./scripts/chacra_upload.sh; fi
   """
 
   sh """#!/bin/bash

diff --git a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
index c5a4d76fa3a163249060c2f9d379074265b95775..2d8ac62a7fa756bce2f735162b8ec7e87755979f 100644 (file)
--- a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
+++ b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
@@ -56,7 +56,7 @@
 
       - bool:
           name: THROWAWAY
-          description: "Whether to push any binaries to Chacra"
+          description: "Whether to push any binaries to Chacra or Pulp.  Overrides CHACRA_UPLOAD and PULP_UPLOAD if either are true."
           default: false
 
       - bool:
@@ -64,6 +64,11 @@
           description: "Whether to push new binaries to Chacra if some are already present"
           default: false
 
+      - bool:
+          name: CHACRA_UPLOAD
+          description: "Whether to upload packages to Chacra"
+          default: true
+
       - bool:
           name: PULP_UPLOAD
           description: "Whether to upload packages to Pulp"

diff --git a/cve-pipeline/config/definitions/cve-pipeline.yml b/cve-pipeline/config/definitions/cve-pipeline.yml
index 6f0491523465aa3cfaa50862454832ae88706c6b..2ad5cd0290efb64678648f9d5410f3e01efc5b95 100644 (file)
--- a/cve-pipeline/config/definitions/cve-pipeline.yml
+++ b/cve-pipeline/config/definitions/cve-pipeline.yml
@@ -69,8 +69,13 @@
 
       - bool:
           name: THROWAWAY
-          description: "DO NOT UNCHECK.  This will push to a chacra node publicly!"
-          default: true
+          description: "Whether to push any binaries to Chacra or Pulp.  Overrides CHACRA_UPLOAD and PULP_UPLOAD if either are true."
+          default: false
+
+      - bool:
+          name: CHACRA_UPLOAD
+          description: "DO NOT CHECK"
+          default: false
 
       - bool:
           name: PULP_UPLOAD