From 2049e10c6bcc7887d36f67f14f0c48432c9ef039 Mon Sep 17 00:00:00 2001
From: "Dennis J. Bell" <dennis.j.bell@gmail.com>
Date: Wed, 9 Aug 2023 08:51:47 -0700
Subject: [PATCH] [ci] Updated upstream manifest modification process

---
 ci/pipeline/base.yml                            | 17 +++++++++--------
 ...{upstream-sync.yml => upstream-manifest.yml} | 12 ++++++------
 .../{upstream.yml => upstream-manifest.yml}     |  4 ++--
 ...st-upstream => get-latest-upstream-manifest} |  0
 ci/settings.yml                                 |  5 ++++-
 ...eam.yml => get-latest-upstream-manifest.yml} |  2 +-
 ci/upstreamrepo.yml                             | 10 ++++++++++
 7 files changed, 32 insertions(+), 18 deletions(-)
 rename ci/pipeline/jobs/{upstream-sync.yml => upstream-manifest.yml} (73%)
 rename ci/pipeline/resources/{upstream.yml => upstream-manifest.yml} (57%)
 rename ci/scripts/{get-latest-upstream => get-latest-upstream-manifest} (100%)
 rename ci/tasks/{get-latest-upstream.yml => get-latest-upstream-manifest.yml} (81%)
 create mode 100644 ci/upstreamrepo.yml

diff --git a/ci/pipeline/base.yml b/ci/pipeline/base.yml
index 1807d2e5..de64a3ef 100644
--- a/ci/pipeline/base.yml
+++ b/ci/pipeline/base.yml
@@ -20,19 +20,20 @@ meta:
   pipeline: (( grab meta.name ))
 
   upstream:
-    package:  example # dummy value for things that don't use upstream
-    path:     (( grab meta.upstream.package ))
-    org:      cloudfoundry
-    repo:     (( concat meta.upstream.org "/" meta.upstream.package ))
-    url:      (( concat "https://github.com/" meta.upstream.repo ".git" ))
+    manifest:
+      package:  example # dummy value for things that don't use upstream
+      path:     (( grab meta.upstream.manifest.package ))
+      org:      cloudfoundry
+      repo:     (( concat meta.upstream.manifest.org "/" meta.upstream.manifest.package ))
+      url:      (( concat "https://github.com/" meta.upstream.manifest.repo ".git" ))
 
   vault:
     url:   (( param "Please provide the address of your Vault" ))
     token: (( param "Please provide a Vault Token" ))
 
   git:
-    email: genesis-ci@rubidiumstudios.com
-    name:  Genesis CI Bot
+    email: ((github.email))
+    name:  ((github.name))
 
   image:
     name: ((image/genesis.url))
@@ -104,7 +105,7 @@ groups:
 
   - name: upstream
     jobs:
-    - upstream-sync
+    - upstream-manifest
 
   - name: versions
     jobs:
diff --git a/ci/pipeline/jobs/upstream-sync.yml b/ci/pipeline/jobs/upstream-manifest.yml
similarity index 73%
rename from ci/pipeline/jobs/upstream-sync.yml
rename to ci/pipeline/jobs/upstream-manifest.yml
index e75f1404..85531efe 100644
--- a/ci/pipeline/jobs/upstream-sync.yml
+++ b/ci/pipeline/jobs/upstream-manifest.yml
@@ -1,5 +1,5 @@
 jobs:
-- name: upstream-sync
+- name: upstream-manifest
   public: true
   serial: true
   plan:
@@ -7,14 +7,14 @@ jobs:
     - in_parallel:
       - { get: git, trigger: false, passed: [spec-tests] }
       - { get: git-ci, trigger: false}
-      - { get: upstream, trigger: true }
-    - task: upstream-sync
-      file: git-ci/ci/tasks/get-latest-upstream.yml
+      - { get: upstream-manifest, trigger: true }
+    - task: upstream-manifest
+      file: git-ci/ci/tasks/get-latest-upstream-manifest.yml
       params:
         GIT_EMAIL:        (( grab meta.git.email ))
         GIT_NAME:         (( grab meta.git.name ))
-        UPSTREAM_PATH:    (( grab meta.upstream.path ))
-        UPSTREAM_REPO:    (( grab meta.upstream.repo ))
+        UPSTREAM_PATH:    (( grab meta.upstream.manifest.path ))
+        UPSTREAM_REPO:    (( grab meta.upstream.manifest.repo ))
     - put: git
       params:
         merge: true
diff --git a/ci/pipeline/resources/upstream.yml b/ci/pipeline/resources/upstream-manifest.yml
similarity index 57%
rename from ci/pipeline/resources/upstream.yml
rename to ci/pipeline/resources/upstream-manifest.yml
index 315f599d..f391e70f 100644
--- a/ci/pipeline/resources/upstream.yml
+++ b/ci/pipeline/resources/upstream-manifest.yml
@@ -1,8 +1,8 @@
 resources:
-  - name: upstream
+  - name: upstream-manifest
     type: git
     check_every: 168h
     source:
-      uri:    (( grab meta.upstream.url ))
+      uri:    (( grab meta.upstream.manifest.url ))
       branch: master
       ignore_paths: [ci/*]
diff --git a/ci/scripts/get-latest-upstream b/ci/scripts/get-latest-upstream-manifest
similarity index 100%
rename from ci/scripts/get-latest-upstream
rename to ci/scripts/get-latest-upstream-manifest
diff --git a/ci/settings.yml b/ci/settings.yml
index 985d3acc..33e1f91f 100644
--- a/ci/settings.yml
+++ b/ci/settings.yml
@@ -10,7 +10,8 @@ meta:
   initial_version: 2.1.0
 
   upstream:
-    package:  cf-deployment
+    manifest:
+      package:  cf-deployment
 
   bosh:
     uri:      ((bosh.uri))
@@ -38,6 +39,8 @@ meta:
     main-branch:  main
     private_key:  ((github.private_key))
     access_token: ((github.access_token))
+    name:         ((github.name))
+    email:        ((github.email))
 
   shout:
     url:      ((shout.url))
diff --git a/ci/tasks/get-latest-upstream.yml b/ci/tasks/get-latest-upstream-manifest.yml
similarity index 81%
rename from ci/tasks/get-latest-upstream.yml
rename to ci/tasks/get-latest-upstream-manifest.yml
index 955bad7b..a687ff5f 100644
--- a/ci/tasks/get-latest-upstream.yml
+++ b/ci/tasks/get-latest-upstream-manifest.yml
@@ -16,4 +16,4 @@ outputs:
   - name: git
 
 run:
-  path: git-ci/ci/scripts/get-latest-upstream
+  path: git-ci/ci/scripts/get-latest-upstream-manifest
diff --git a/ci/upstreamrepo.yml b/ci/upstreamrepo.yml
new file mode 100644
index 00000000..deaf071f
--- /dev/null
+++ b/ci/upstreamrepo.yml
@@ -0,0 +1,10 @@
+repos:
+- name: bosh
+  repo: https://github.com/cloudfoundry/bosh
+- name: credhub
+  repo: https://github.com/pivotal/credhub-release
+- name: bpm
+  repo: https://github.com/cloudfoundry/bpm-release
+- name: uaa
+  repo: https://github.com/cloudfoundry/uaa-release
+