remove the dead TEST='test' chacra ref logic

The TEST parameter was meant to push release packages to chacra under
the 'test' ref, but the logic has been dead for a while: neither
ceph-dev-pipeline.yml defines a TEST parameter nor does
ceph-release-pipeline forward one when triggering the build.  It was
also broken if ever enabled (env.SHA1[0..6] on the 4-character 'test'
string throws).  Remove the ref override from doUploadChacraStage and
the unused TEST parameter from ceph-release-pipeline.

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

diff --git a/ceph-dev-pipeline/build/Jenkinsfile b/ceph-dev-pipeline/build/Jenkinsfile
index 8fdf92bd4b00d3cb7fcfbf86fa2764dcff7ec773..42ed430dfd22cb8fa912c596479d48bef3bdf9c3 100644 (file)
--- a/ceph-dev-pipeline/build/Jenkinsfile
+++ b/ceph-dev-pipeline/build/Jenkinsfile
@@ -534,23 +534,16 @@ def doUploadChacraStage() {
   def chacra_url = sh(
     script: "grep '^url' ~/.chacractl", returnStdout: true,
   ).trim().split('"')[1].trim().replaceAll(/\/+$/, '')
-  // Push packages to chacra.ceph.com under the 'test' ref if
-  // ceph-release-pipeline's TEST=true. Scoped with withEnv below instead of
-  // mutating env.SHA1, which is shared with the Pulp stage and with every
-  // other matrix cell.
-  def target_sha1 = env.TEST?.toBoolean() ? "test" : env.SHA1
   withUploadEnv {
     if (os.pkg_type == "rpm") {
-      def repo_url = "${chacra_url}/r/ceph/${env.BRANCH}/${target_sha1}/${os.name}/${os.version_name}/flavors/${env.FLAVOR}"
+      def repo_url = "${chacra_url}/r/ceph/${env.BRANCH}/${env.SHA1}/${os.name}/${os.version_name}/flavors/${env.FLAVOR}"
       buildCephReleaseRpm(repo_url)
     }
     // CHACRACTL_KEY/SHAMAN_API_KEY come from the "upload packages" stage
     // environment{} block, which also covers its post{} shaman updates.
-    withEnv(["SHA1=${target_sha1}"]) {
-      sh """#!/bin/bash -ex
-        export CHACRA_URL="${chacra_url}/" && ./scripts/chacra_upload.sh
-      """
-    }
+    sh """#!/bin/bash -ex
+      export CHACRA_URL="${chacra_url}/" && ./scripts/chacra_upload.sh
+    """
   }
 }
 

diff --git a/ceph-release-pipeline/config/definitions/ceph-release-pipeline.yml b/ceph-release-pipeline/config/definitions/ceph-release-pipeline.yml
index 91647411f76ff7b1de39176f7921d7484fdc2e44..af33908ab75b9da7d08c149bd99757a0683ddaf0 100644 (file)
--- a/ceph-release-pipeline/config/definitions/ceph-release-pipeline.yml
+++ b/ceph-release-pipeline/config/definitions/ceph-release-pipeline.yml
@@ -28,13 +28,6 @@
           name: VERSION
           description: "The version for release, e.g. 0.94.4"
 
-      - bool:
-          name: TEST
-          description: |
-            If this is unchecked, then the builds will be pushed to chacra with the correct ref. This is the default.
-
-            If this is checked, then the builds will be pushed to chacra under the 'test' ref.
-
       - bool:
           name: TAG
           description: |