cve-pipeline: allow specifying a private fork of ceph.git

Convert CEPH_REPO from a single-choice dropdown to a free-form string
parameter (defaulting to ceph-private.git as before) in both cve-pipeline
and cve-source-dist so CVE fixes can be built from GitHub Security
Advisory temporary private forks (e.g.
git@github.com:ceph/ceph-ghsa-xxxx-xxxx-xxxx.git).

The change to cve-source-dist is required because ceph-dev-pipeline's
Jenkinsfile forwards CEPH_REPO to the setup job as a string parameter,
and a choice parameter would reject values not in its list.

The ceph-jenkins GitHub account must be added as a collaborator on the
security advisory for its fork to be cloneable.

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

diff --git a/cve-pipeline/config/definitions/cve-pipeline.yml b/cve-pipeline/config/definitions/cve-pipeline.yml
index 621a59df69e09c28f9e012e54da10fb970e39f5a..80e0aac515bc96395c81fe93a057214f04c604f4 100644 (file)
--- a/cve-pipeline/config/definitions/cve-pipeline.yml
+++ b/cve-pipeline/config/definitions/cve-pipeline.yml
@@ -40,7 +40,7 @@
     parameters:
       - string:
           name: BRANCH
-          description: "The branch from ceph-private.git to build"
+          description: "The branch from CEPH_REPO to build"
           default: main
 
       - choice:
@@ -49,10 +49,10 @@
           choices:
             - ''
 
-      - choice:
+      - string:
           name: CEPH_REPO
-          choices:
-            - git@github.com:ceph/ceph-private.git
+          description: "SSH URL of the private repo to build.  Can be a GitHub Security Advisory private fork (e.g. git@github.com:ceph/ceph-ghsa-xxxx-xxxx-xxxx.git).  The ceph-jenkins GitHub account must have access to the repo."
+          default: git@github.com:ceph/ceph-private.git
 
       - string:
           name: DISTROS

diff --git a/cve-source-dist/config/definitions/cve-source-dist.yml b/cve-source-dist/config/definitions/cve-source-dist.yml
index c545ff28279006a1b8f426a72d87b8e4e326f31f..bd468f8421b3eaa03d568912d5c79ae601e27ba0 100644 (file)
--- a/cve-source-dist/config/definitions/cve-source-dist.yml
+++ b/cve-source-dist/config/definitions/cve-source-dist.yml
@@ -41,10 +41,10 @@
             - scm-tag
 
     parameters:
-      - choice:
+      - string:
           name: CEPH_REPO
-          choices:
-            - git@github.com:ceph/ceph-private.git
+          description: "SSH URL of the private repo to build.  Can be a GitHub Security Advisory private fork (e.g. git@github.com:ceph/ceph-ghsa-xxxx-xxxx-xxxx.git).  The ceph-jenkins GitHub account must have access to the repo."
+          default: git@github.com:ceph/ceph-private.git
 
       - string:
           name: BRANCH