Merge pull request #155 from cgwalters/metadata

pipeline-utils: Group secret and not-secret values
openshift · Jul 5, 2018 · 865a36a · 865a36a
2 parents 9535a7a + 6782ffd
commit 865a36a
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/pipeline-utils.groovy b/pipeline-utils.groovy
@@ -21,12 +21,6 @@ def define_properties(timer) {
     properties([
       pipelineTriggers(timer == null ? [] : [cron(timer)]),
       parameters([
-        booleanParam(name: 'DRY_RUN', defaultValue: developmentPipeline, description: 'If true, do not push changes'),
-        credentials(name: 'ARTIFACT_SERVER',
-                    credentialType: 'org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl',
-                    description: "Server used to push/receive built artifacts.",
-                    defaultValue: 'c051c78a-7210-4dec-92de-6f51616aac79',
-                    required: true),
         credentials(name: 'ARTIFACT_SSH_CREDS_ID',
                     credentialType: 'com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey',
                     description: "SSH key for artifact server.",
@@ -42,24 +36,32 @@ def define_properties(timer) {
                     description: "OpenShift AWS CI root account number.",
                     defaultValue: '4d186169-c856-4da0-bd9e-0c976c264e83',
                     required: true),
-        credentials(name: 'S3_PRIVATE_BUCKET',
-                    credentialType: 'org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl',
-                    description: "Private S3 bucket to use when uploading AMIs.",
-                    defaultValue: '5c9571a2-c492-421f-b506-ba469afffc10',
-                    required: true),
         credentials(name: 'REGISTRY_CREDENTIALS',
                     credentialType: 'com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl',
                     description: "Credentials for Docker registry.",
                     defaultValue: 'e3fd566b-46c1-44e4-aec9-bb59214c1926',
                     required: true),
+        // Past here, we're just using parameters as a way to avoid hardcoding internal values; they
+        // are not actually secret.
+        booleanParam(name: 'DRY_RUN', defaultValue: developmentPipeline, description: 'If true, do not push changes'),
+        credentials(name: 'ARTIFACT_SERVER',
+                    credentialType: 'org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl',
+                    description: "(not secret) Server used to push/receive built artifacts.",
+                    defaultValue: 'c051c78a-7210-4dec-92de-6f51616aac79',
+                    required: true),
+        credentials(name: 'S3_PRIVATE_BUCKET',
+                    credentialType: 'org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl',
+                    description: "(not secret) Private S3 bucket to use when uploading AMIs.",
+                    defaultValue: '5c9571a2-c492-421f-b506-ba469afffc10',
+                    required: true),
         credentials(name: 'OSTREE_INSTALL_URL',
                     credentialType: 'org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl',
-                    description: "Remote OSTree repo URL to install from when running imagefactory.",
+                    description: "(not secret) Remote OSTree repo URL to install from when running imagefactory.",
                     defaultValue: '2d6637ef-7f53-4ee2-bd35-7865908560c7',
                     required: true),
         credentials(name: 'INSTALLER_TREE_URL',
                     credentialType: 'org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl',
-                    description: "Local installer tree mirror to use when running imagefactory.",
+                    description: "(not secret) Local installer tree mirror to use when running imagefactory.",
                     defaultValue: '50db8fac-f9d8-44e1-af0f-be29325a2896',
                     required: true),
       ])