From c3d7d5d302278f05e629a4a2a00a31c5f6354f67 Mon Sep 17 00:00:00 2001
From: Bradford Dabbs <brad@perched.io>
Date: Fri, 26 Apr 2019 10:11:22 -0500
Subject: [PATCH 01/10] Change mirror url to variable

---
 concourse/download_minimal_iso.sh | 4 +++-
 concourse/upload.sh               | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/concourse/download_minimal_iso.sh b/concourse/download_minimal_iso.sh
index 8033e2c..3c674bb 100755
--- a/concourse/download_minimal_iso.sh
+++ b/concourse/download_minimal_iso.sh
@@ -13,8 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+LOCAL_MIRROR_HOST=$1
+
 # mkdir
 mkdir -p centos-minimal-iso
 
 # download ISO
-curl -sL internal-mirror.cyberlab.lan/upstream/$(curl -L -s  internal-mirror.cyberlab.lan/upstream | awk -F '"' '/href.*Minimal/ {print $2}') -o centos-minimal-iso/centos-minimal.iso
+curl -sL ${LOCAL_MIRROR_HOST}/upstream/$(curl -L -s ${LOCAL_MIRROR_HOST}/upstream | awk -F '"' '/href.*Minimal/ {print $2}') -o centos-minimal-iso/centos-minimal.iso
diff --git a/concourse/upload.sh b/concourse/upload.sh
index 0bf5a50..c5160f8 100755
--- a/concourse/upload.sh
+++ b/concourse/upload.sh
@@ -18,4 +18,4 @@ chmod 0600 /root/.ssh/*
 # Upload to local mirror
 rsync -e "ssh -o StrictHostKeyChecking=no -i /root/.ssh/id_ed25519" -rv rocknsm-iso/ $LOCAL_MIRROR_USER@$LOCAL_MIRROR_HOST:/var/www/mirror/public/isos/$LOCAL_MIRROR_REPO/
 # Sync to public mirror
-ssh -i /root/.ssh/id_ed25519 -o StrictHostKeyChecking=no admin@mirror.cyberlab.lan 'rsync -rlvtP -e "ssh -i ~/.ssh/mirror_sync" /var/www/mirror/public/ mirror_sync@mirror.rocknsm.io:/var/www/mirror/ --delete'
+ssh -i /root/.ssh/id_ed25519 -o StrictHostKeyChecking=no admin@${LOCAL_MIRROR_HOST} 'rsync -rlvtP -e "ssh -i ~/.ssh/mirror_sync" /var/www/mirror/public/ mirror_sync@mirror.rocknsm.io:/var/www/mirror/ --delete'

From 9d7c8896af2f9d36c4be02c8a644bd75107a7bb5 Mon Sep 17 00:00:00 2001
From: Bradford Dabbs <brad@perched.io>
Date: Fri, 26 Apr 2019 10:35:39 -0500
Subject: [PATCH 02/10] Add mirror var to pipeline

---
 concourse/pipelines/manual/pipeline.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/concourse/pipelines/manual/pipeline.yml b/concourse/pipelines/manual/pipeline.yml
index 46f9d17..2287e5d 100644
--- a/concourse/pipelines/manual/pipeline.yml
+++ b/concourse/pipelines/manual/pipeline.yml
@@ -34,12 +34,16 @@ jobs:
       outputs:
         - name: centos-minimal-iso
       run:
-        path: rock-createiso-git/concourse/download_minimal_iso.sh
+        path: /bin/bash
+        args:
+          - 'c'
+          - 'rock-createiso-git/concourse/download_minimal_iso.sh $1'
     on_failure:
       put: RockNSM-Slack
       params:
         text: "Concourse Manual failed to build. Could not retrieve a copy of centos minimal iso."
         username: "Concourse-CI"
+        MIRROR_HOST: ((mirror-host))
         # icon_url: URL
 
   - task: ROCK Create ISO

From 760b2398fde8f2ab7149246ad8959c68b7eb88dc Mon Sep 17 00:00:00 2001
From: Bradford Dabbs <brad@perched.io>
Date: Fri, 26 Apr 2019 10:51:44 -0500
Subject: [PATCH 03/10] Fix typo in pipeline args

---
 concourse/pipelines/manual/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/concourse/pipelines/manual/pipeline.yml b/concourse/pipelines/manual/pipeline.yml
index 2287e5d..c511e4d 100644
--- a/concourse/pipelines/manual/pipeline.yml
+++ b/concourse/pipelines/manual/pipeline.yml
@@ -36,7 +36,7 @@ jobs:
       run:
         path: /bin/bash
         args:
-          - 'c'
+          - '-c'
           - 'rock-createiso-git/concourse/download_minimal_iso.sh $1'
     on_failure:
       put: RockNSM-Slack

From b1487c1f4c3bbb28bde4f779c047d7cdb436e635 Mon Sep 17 00:00:00 2001
From: Bradford Dabbs <brad@perched.io>
Date: Fri, 26 Apr 2019 11:02:27 -0500
Subject: [PATCH 04/10] Fix parameter syntax

---
 concourse/pipelines/manual/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/concourse/pipelines/manual/pipeline.yml b/concourse/pipelines/manual/pipeline.yml
index c511e4d..5f30246 100644
--- a/concourse/pipelines/manual/pipeline.yml
+++ b/concourse/pipelines/manual/pipeline.yml
@@ -37,7 +37,7 @@ jobs:
         path: /bin/bash
         args:
           - '-c'
-          - 'rock-createiso-git/concourse/download_minimal_iso.sh $1'
+          - 'rock-createiso-git/concourse/download_minimal_iso.sh "$MIRROR_HOST"'
     on_failure:
       put: RockNSM-Slack
       params:

From 7bc57336046733e11c9204f101071864ed316176 Mon Sep 17 00:00:00 2001
From: Bradford Dabbs <brad@perched.io>
Date: Fri, 26 Apr 2019 11:09:27 -0500
Subject: [PATCH 05/10] Put param in correct place :doh:

---
 concourse/pipelines/manual/pipeline.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/concourse/pipelines/manual/pipeline.yml b/concourse/pipelines/manual/pipeline.yml
index 5f30246..4f3f374 100644
--- a/concourse/pipelines/manual/pipeline.yml
+++ b/concourse/pipelines/manual/pipeline.yml
@@ -38,12 +38,13 @@ jobs:
         args:
           - '-c'
           - 'rock-createiso-git/concourse/download_minimal_iso.sh "$MIRROR_HOST"'
+      params:
+        MIRROR_HOST: ((mirror-host))
     on_failure:
       put: RockNSM-Slack
       params:
         text: "Concourse Manual failed to build. Could not retrieve a copy of centos minimal iso."
         username: "Concourse-CI"
-        MIRROR_HOST: ((mirror-host))
         # icon_url: URL
 
   - task: ROCK Create ISO

From e5f82573882a56f0730f7e99f9c9cd40f7208a57 Mon Sep 17 00:00:00 2001
From: Bradford Dabbs <brad@perched.io>
Date: Fri, 26 Apr 2019 11:14:57 -0500
Subject: [PATCH 06/10] Update remaining pipelines

---
 concourse/pipelines/nightly/pipeline.yml | 7 ++++++-
 concourse/pipelines/release/pipeline.yml | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/concourse/pipelines/nightly/pipeline.yml b/concourse/pipelines/nightly/pipeline.yml
index e1ca67f..2958a50 100644
--- a/concourse/pipelines/nightly/pipeline.yml
+++ b/concourse/pipelines/nightly/pipeline.yml
@@ -42,7 +42,12 @@ jobs:
       outputs:
         - name: centos-minimal-iso
       run:
-        path: rock-createiso-git/concourse/download_minimal_iso.sh
+        path: /bin/bash
+        args:
+          - '-c'
+          - 'rock-createiso-git/concourse/download_minimal_iso.sh "$MIRROR_HOST"'
+      params:
+        MIRROR_HOST: ((mirror-host))
     on_failure:
       put: RockNSM-Slack
       params:
diff --git a/concourse/pipelines/release/pipeline.yml b/concourse/pipelines/release/pipeline.yml
index dd3f18f..b1c415e 100644
--- a/concourse/pipelines/release/pipeline.yml
+++ b/concourse/pipelines/release/pipeline.yml
@@ -43,7 +43,12 @@ jobs:
       outputs:
         - name: centos-minimal-iso
       run:
-        path: rock-createiso-git/concourse/download_minimal_iso.sh
+        path: /bin/bash
+        args:
+          - '-c'
+          - 'rock-createiso-git/concourse/download_minimal_iso.sh "$MIRROR_HOST"'
+      params:
+        MIRROR_HOST: ((mirror-host))
     on_failure:
       put: RockNSM-Slack
       params:

From be1d67927a0093545412ce0e06095442e4609ff2 Mon Sep 17 00:00:00 2001
From: Bradford Dabbs <brad@perched.io>
Date: Fri, 26 Apr 2019 11:31:38 -0500
Subject: [PATCH 07/10] Change pulp host to variable

---
 concourse/create_iso.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/concourse/create_iso.sh b/concourse/create_iso.sh
index 924d561..b5b89ee 100755
--- a/concourse/create_iso.sh
+++ b/concourse/create_iso.sh
@@ -22,6 +22,7 @@ GPG_KEY_PASS="$2"
 GPG_KEY="$3"
 ENABLE_TESTING=$4
 OFFICIAL_RELEASE=$5
+PULP_HOST=$6
 
 if [[ $OFFICIAL_RELEASE -eq 1 ]]; then
   # Curl the tags and find the latest tag available on github and cut out all the other cruft
@@ -54,11 +55,11 @@ echo "-g $GPG_KEY_NAME"
 echo "-p HIDDEN PASSWORD"
 echo "-i $GPG_KEY_PATH"
 echo "-t $ENABLE_TESTING"
-echo "-b http://pulp.cyberlab.lan/pulp/repos/centos/7.5/os/"
-echo "-e http://pulp.cyberlab.lan/pulp/repos/centos/7.5/extras/"
-echo "-E http://pulp.cyberlab.lan/pulp/repos/epel/7/x86_64/"
-echo "-u http://pulp.cyberlab.lan/pulp/repos/centos/7.5/updates/"
-echo "-l http://pulp.cyberlab.lan/pulp/repos/elastic/6/"
+echo "-b http://${PULP_HOST}/pulp/repos/centos/7.5/os/"
+echo "-e http://${PULP_HOST}/pulp/repos/centos/7.5/extras/"
+echo "-E http://${PULP_HOST}/pulp/repos/epel/7/x86_64/"
+echo "-u http://${PULP_HOST}/pulp/repos/centos/7.5/updates/"
+echo "-l http://${PULP_HOST}/pulp/repos/elastic/6/"
 
 set +x
 ../master-iso.sh \
@@ -68,9 +69,9 @@ set +x
 -p "$GPG_KEY_PASS" \
 -i "$GPG_KEY_PATH" \
 -t "$ENABLE_TESTING" \
--b "http://pulp.cyberlab.lan/pulp/repos/centos/7/os/" \
--e "http://pulp.cyberlab.lan/pulp/repos/centos/7/extras/" \
--E "http://pulp.cyberlab.lan/pulp/repos/epel/7/x86_64/" \
--u "http://pulp.cyberlab.lan/pulp/repos/centos/7/updates/" \
--l "http://pulp.cyberlab.lan/pulp/repos/elastic/7/" \
+-b "http://${PULP_HOST}/pulp/repos/centos/7/os/" \
+-e "http://${PULP_HOST}/pulp/repos/centos/7/extras/" \
+-E "http://${PULP_HOST}/pulp/repos/epel/7/x86_64/" \
+-u "http://${PULP_HOST}/pulp/repos/centos/7/updates/" \
+-l "http://${PULP_HOST}/pulp/repos/elastic/7/" \
 -a 'https://packagecloud.io/rocknsm/2_4/el/7/$basearch'

From 833701a3b3ef8e9ec5255387ffb63162072985fb Mon Sep 17 00:00:00 2001
From: Bradford Dabbs <brad@perched.io>
Date: Fri, 26 Apr 2019 11:47:55 -0500
Subject: [PATCH 08/10] Add pulp_host parameter to pipelines

---
 concourse/pipelines/manual/pipeline.yml  | 3 ++-
 concourse/pipelines/nightly/pipeline.yml | 3 ++-
 concourse/pipelines/release/pipeline.yml | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/concourse/pipelines/manual/pipeline.yml b/concourse/pipelines/manual/pipeline.yml
index 4f3f374..fcf3042 100644
--- a/concourse/pipelines/manual/pipeline.yml
+++ b/concourse/pipelines/manual/pipeline.yml
@@ -62,13 +62,14 @@ jobs:
         path: /bin/bash
         args:
           - '-c'
-          - 'rock-createiso-git/concourse/create_iso.sh "$GPG_KEY_NAME" "$GPG_KEY_PASS" "$GPG_KEY" "$ENABLE_TESTING" "$OFFICIAL_RELEASE"'
+          - 'rock-createiso-git/concourse/create_iso.sh "$GPG_KEY_NAME" "$GPG_KEY_PASS" "$GPG_KEY" "$ENABLE_TESTING" "$OFFICIAL_RELEASE" "$PULP_HOST"'
       params:
         GPG_KEY: ((gpg-key))
         GPG_KEY_PASS: ((gpg-passphrase))
         GPG_KEY_NAME: ((gpg-key-name))
         ENABLE_TESTING: 1
         OFFICIAL_RELEASE: 0
+        PULP_HOST: ((pulp-host))
     on_failure:
       put: RockNSM-Slack
       params:
diff --git a/concourse/pipelines/nightly/pipeline.yml b/concourse/pipelines/nightly/pipeline.yml
index 2958a50..d520dca 100644
--- a/concourse/pipelines/nightly/pipeline.yml
+++ b/concourse/pipelines/nightly/pipeline.yml
@@ -70,13 +70,14 @@ jobs:
         path: /bin/bash
         args:
           - '-c'
-          - 'rock-createiso-git/concourse/create_iso.sh "$GPG_KEY_NAME" "$GPG_KEY_PASS" "$GPG_KEY" "$ENABLE_TESTING" "$OFFICIAL_RELEASE"'
+          - 'rock-createiso-git/concourse/create_iso.sh "$GPG_KEY_NAME" "$GPG_KEY_PASS" "$GPG_KEY" "$ENABLE_TESTING" "$OFFICIAL_RELEASE" "$PULP_HOST"'
       params:
         GPG_KEY: ((gpg-key))
         GPG_KEY_PASS: ((gpg-passphrase))
         GPG_KEY_NAME: ((gpg-key-name))
         ENABLE_TESTING: 1
         OFFICIAL_RELEASE: 0
+        PULP_HOST: ((pulp-host))
     on_failure:
       put: RockNSM-Slack
       params:
diff --git a/concourse/pipelines/release/pipeline.yml b/concourse/pipelines/release/pipeline.yml
index b1c415e..6837767 100644
--- a/concourse/pipelines/release/pipeline.yml
+++ b/concourse/pipelines/release/pipeline.yml
@@ -71,13 +71,14 @@ jobs:
         path: /bin/bash
         args:
           - '-c'
-          - 'rock-createiso-git/concourse/create_iso.sh "$GPG_KEY_NAME" "$GPG_KEY_PASS" "$GPG_KEY" "$ENABLE_TESTING" "$OFFICIAL_RELEASE"'
+          - 'rock-createiso-git/concourse/create_iso.sh "$GPG_KEY_NAME" "$GPG_KEY_PASS" "$GPG_KEY" "$ENABLE_TESTING" "$OFFICIAL_RELEASE" "$PULP_HOST"'
       params:
         GPG_KEY: ((gpg-key))
         GPG_KEY_PASS: ((gpg-passphrase))
         GPG_KEY_NAME: ((gpg-key-name))
         ENABLE_TESTING: 0
         OFFICIAL_RELEASE: 1
+        PULP_HOST: ((pulp-host))
     on_failure:
       put: RockNSM-Slack
       params:

From a6a2fbe9139679f96ec88a47c4183f57b47b5d09 Mon Sep 17 00:00:00 2001
From: Bradford Dabbs <brad@perched.io>
Date: Fri, 26 Apr 2019 12:59:03 -0500
Subject: [PATCH 09/10] Add mirror vars to prerelease pipeline

---
 concourse/pipelines/prerelease/pipeline.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/concourse/pipelines/prerelease/pipeline.yml b/concourse/pipelines/prerelease/pipeline.yml
index d57b644..90f5693 100644
--- a/concourse/pipelines/prerelease/pipeline.yml
+++ b/concourse/pipelines/prerelease/pipeline.yml
@@ -34,7 +34,12 @@ jobs:
           outputs:
             - name: centos-minimal-iso
           run:
-            path: rock-createiso-git/concourse/download_minimal_iso.sh
+            path: /bin/bash
+            args:
+              - '-c'
+              - 'rock-createiso-git/concourse/download_minimal_iso.sh "$MIRROR_HOST"'
+          params:
+            MIRROR_HOST: ((mirror-host))
         on_failure:
           put: RockNSM-Slack
           params:
@@ -57,13 +62,14 @@ jobs:
             path: /bin/bash
             args:
               - '-c'
-              - 'rock-createiso-git/concourse/create_iso.sh "$GPG_KEY_NAME" "$GPG_KEY_PASS" "$GPG_KEY" "$ENABLE_TESTING" "OFFICIAL_RELEASE"'
+              - 'rock-createiso-git/concourse/create_iso.sh "$GPG_KEY_NAME" "$GPG_KEY_PASS" "$GPG_KEY" "$ENABLE_TESTING" "OFFICIAL_RELEASE" "$PULP_HOST"'
           params:
             GPG_KEY: ((gpg-key))
             GPG_KEY_PASS: ((gpg-passphrase))
             GPG_KEY_NAME: ((gpg-key-name))
             ENABLE_TESTING: 0
             OFFICIAL_RELEASE: 0
+            PULP_HOST: ((pulp-host))
         on_failure:
           put: RockNSM-Slack
           params:

From 297f1b8854ee68c1c080d58c730ab72a17075819 Mon Sep 17 00:00:00 2001
From: Bradford Dabbs <brad@perched.io>
Date: Fri, 26 Apr 2019 13:00:08 -0500
Subject: [PATCH 10/10] Fix spacing

---
 concourse/pipelines/manual/pipeline.yml  | 170 +++++++++++-----------
 concourse/pipelines/nightly/pipeline.yml | 174 +++++++++++------------
 concourse/pipelines/release/pipeline.yml | 174 +++++++++++------------
 3 files changed, 259 insertions(+), 259 deletions(-)

diff --git a/concourse/pipelines/manual/pipeline.yml b/concourse/pipelines/manual/pipeline.yml
index 4c9f3a5..0601218 100644
--- a/concourse/pipelines/manual/pipeline.yml
+++ b/concourse/pipelines/manual/pipeline.yml
@@ -22,88 +22,88 @@ jobs:
     build_logs_to_retain: 14
     serial: true
     plan:
-    - get: rock-createiso-git
-    - task: Download centOS Minimal ISO
-      config:
-        platform: linux
-        image_resource:
-          type: docker-image
-          source: { repository: centos }
-        inputs:
-          - name: rock-createiso-git
-        outputs:
-          - name: centos-minimal-iso
-        run:
-          path: /bin/bash
-          args:
-            - '-c'
-            - 'rock-createiso-git/concourse/download_minimal_iso.sh "$MIRROR_HOST"'
-        params:
-          MIRROR_HOST: ((mirror-host))
-      on_failure:
-        put: RockNSM-Slack
-        params:
-          text: "Concourse Manual failed to build. Could not retrieve a copy of centos minimal iso."
-          username: "Concourse-CI"
-          # icon_url: URL
-  
-    - task: ROCK Create ISO
-      config:
-        platform: linux
-        image_resource:
-          type: docker-image
-          source: { repository: centos }
-        inputs:
-          - name: rock-createiso-git
-          - name: centos-minimal-iso
-        outputs:
-          - name: rocknsm-iso
-        run:
-          path: /bin/bash
-          args:
-            - '-c'
-            - 'rock-createiso-git/concourse/create_iso.sh "$GPG_KEY_NAME" "$GPG_KEY_PASS" "$GPG_KEY" "$ENABLE_TESTING" "$OFFICIAL_RELEASE" "$PULP_HOST"'
-        params:
-          GPG_KEY: ((gpg-key))
-          GPG_KEY_PASS: ((gpg-passphrase))
-          GPG_KEY_NAME: ((gpg-key-name))
-          ENABLE_TESTING: 1
-          OFFICIAL_RELEASE: 0
-          PULP_HOST: ((pulp-host))
-      on_failure:
-        put: RockNSM-Slack
-        params:
-          text: "Concourse Manual Failed to build. Task: ROCK Create ISO. Check webui for additional information."
-          username: "Concourse-CI"
-          # icon_url: URL
-    - task: Upload ISO
-      config:
-        platform: linux
-        image_resource:
-          type: docker-image
-          source: { repository: centos }
-        inputs:
-          - name: rocknsm-iso
-          - name: rock-createiso-git
-        run:
-          path: /bin/bash
-          args:
-            - '-c'
-            - 'rock-createiso-git/concourse/upload.sh "$MIRROR_USER" "$MIRROR_PASS" "$MIRROR_HOST" "$MIRROR_REPO" "$MIRROR_PRIVATE" "$MIRROR_PUBLIC"'
-        params:
-          MIRROR_USER: ((mirror-user))
-          MIRROR_PASS: ((mirror-pass))
-          MIRROR_HOST: ((mirror-host))
-          MIRROR_REPO: "testing"
-          MIRROR_PRIVATE: ((mirror-private-key))
-          MIRROR_PUBLIC: ((mirror-public-key))
-      on_failure:
-        put: RockNSM-Slack
-        params:
-          text: "Concourse Manual prerelease Failed to upload ISO to mirror. Check webui for additional information."
-          username: "Concourse-CI"
-      on_success:
-        put: RockNSM-Slack
-        params:
-          text: "Concourse Manual prerelease build successful. The prerelease build can be found here <((mirror-uri))|Manual Release>"
-          username: "Concourse-CI"
+      - get: rock-createiso-git
+      - task: Download centOS Minimal ISO
+        config:
+          platform: linux
+          image_resource:
+            type: docker-image
+            source: { repository: centos }
+          inputs:
+            - name: rock-createiso-git
+          outputs:
+            - name: centos-minimal-iso
+          run:
+            path: /bin/bash
+            args:
+              - '-c'
+              - 'rock-createiso-git/concourse/download_minimal_iso.sh "$MIRROR_HOST"'
+          params:
+            MIRROR_HOST: ((mirror-host))
+        on_failure:
+          put: RockNSM-Slack
+          params:
+            text: "Concourse Manual failed to build. Could not retrieve a copy of centos minimal iso."
+            username: "Concourse-CI"
+            # icon_url: URL
+    
+      - task: ROCK Create ISO
+        config:
+          platform: linux
+          image_resource:
+            type: docker-image
+            source: { repository: centos }
+          inputs:
+            - name: rock-createiso-git
+            - name: centos-minimal-iso
+          outputs:
+            - name: rocknsm-iso
+          run:
+            path: /bin/bash
+            args:
+              - '-c'
+              - 'rock-createiso-git/concourse/create_iso.sh "$GPG_KEY_NAME" "$GPG_KEY_PASS" "$GPG_KEY" "$ENABLE_TESTING" "$OFFICIAL_RELEASE" "$PULP_HOST"'
+          params:
+            GPG_KEY: ((gpg-key))
+            GPG_KEY_PASS: ((gpg-passphrase))
+            GPG_KEY_NAME: ((gpg-key-name))
+            ENABLE_TESTING: 1
+            OFFICIAL_RELEASE: 0
+            PULP_HOST: ((pulp-host))
+        on_failure:
+          put: RockNSM-Slack
+          params:
+            text: "Concourse Manual Failed to build. Task: ROCK Create ISO. Check webui for additional information."
+            username: "Concourse-CI"
+            # icon_url: URL
+      - task: Upload ISO
+        config:
+          platform: linux
+          image_resource:
+            type: docker-image
+            source: { repository: centos }
+          inputs:
+            - name: rocknsm-iso
+            - name: rock-createiso-git
+          run:
+            path: /bin/bash
+            args:
+              - '-c'
+              - 'rock-createiso-git/concourse/upload.sh "$MIRROR_USER" "$MIRROR_PASS" "$MIRROR_HOST" "$MIRROR_REPO" "$MIRROR_PRIVATE" "$MIRROR_PUBLIC"'
+          params:
+            MIRROR_USER: ((mirror-user))
+            MIRROR_PASS: ((mirror-pass))
+            MIRROR_HOST: ((mirror-host))
+            MIRROR_REPO: "testing"
+            MIRROR_PRIVATE: ((mirror-private-key))
+            MIRROR_PUBLIC: ((mirror-public-key))
+        on_failure:
+          put: RockNSM-Slack
+          params:
+            text: "Concourse Manual prerelease Failed to upload ISO to mirror. Check webui for additional information."
+            username: "Concourse-CI"
+        on_success:
+          put: RockNSM-Slack
+          params:
+            text: "Concourse Manual prerelease build successful. The prerelease build can be found here <((mirror-uri))|Manual Release>"
+            username: "Concourse-CI"
diff --git a/concourse/pipelines/nightly/pipeline.yml b/concourse/pipelines/nightly/pipeline.yml
index 493221d..f420432 100644
--- a/concourse/pipelines/nightly/pipeline.yml
+++ b/concourse/pipelines/nightly/pipeline.yml
@@ -28,90 +28,90 @@ jobs:
     build_logs_to_retain: 14
     serial: true
     plan:
-    - get: rock-createiso-git
-    - get: Nightly-Timer
-      trigger: true
-    - task: Download centOS Minimal ISO
-      config:
-        platform: linux
-        image_resource:
-          type: docker-image
-          source: { repository: centos }
-        inputs:
-          - name: rock-createiso-git
-        outputs:
-          - name: centos-minimal-iso
-        run:
-          path: /bin/bash
-          args:
-            - '-c'
-            - 'rock-createiso-git/concourse/download_minimal_iso.sh "$MIRROR_HOST"'
-        params:
-          MIRROR_HOST: ((mirror-host))
-      on_failure:
-        put: RockNSM-Slack
-        params:
-          text: "Concourse Nightly failed to build. Could not retrieve a copy of centos minimal iso."
-          username: "Concourse-CI"
-          # icon_url: URL
-
-    - task: ROCK Create ISO
-      config:
-        platform: linux
-        image_resource:
-          type: docker-image
-          source: { repository: centos }
-        inputs:
-          - name: rock-createiso-git
-          - name: centos-minimal-iso
-        outputs:
-          - name: rocknsm-iso
-        run:
-          path: /bin/bash
-          args:
-            - '-c'
-            - 'rock-createiso-git/concourse/create_iso.sh "$GPG_KEY_NAME" "$GPG_KEY_PASS" "$GPG_KEY" "$ENABLE_TESTING" "$OFFICIAL_RELEASE" "$PULP_HOST"'
-        params:
-          GPG_KEY: ((gpg-key))
-          GPG_KEY_PASS: ((gpg-passphrase))
-          GPG_KEY_NAME: ((gpg-key-name))
-          ENABLE_TESTING: 1
-          OFFICIAL_RELEASE: 0
-          PULP_HOST: ((pulp-host))
-      on_failure:
-        put: RockNSM-Slack
-        params:
-          text: "Concourse Nightly Failed to build. Task: ROCK Create ISO. Check webui for additional information."
-          username: "Concourse-CI"
-          # icon_url: URL
-    - task: Upload ISO
-      config:
-        platform: linux
-        image_resource:
-          type: docker-image
-          source: { repository: centos }
-        inputs:
-          - name: rock-createiso-git
-          - name: rocknsm-iso
-        run:
-          path: /bin/bash
-          args:
-            - '-c'
-            - 'rock-createiso-git/concourse/upload.sh "$MIRROR_USER" "$MIRROR_PASS" "$MIRROR_HOST" "$MIRROR_REPO" "$MIRROR_PRIVATE" "$MIRROR_PUBLIC"'
-        params:
-          MIRROR_USER: ((mirror-user))
-          MIRROR_PASS: ((mirror-pass))
-          MIRROR_HOST: ((mirror-host))
-          MIRROR_REPO: "testing"
-          MIRROR_PRIVATE: ((mirror-private-key))
-          MIRROR_PUBLIC: ((mirror-public-key))
-      on_failure:
-        put: RockNSM-Slack
-        params:
-          text: "Concourse Nightly Release Failed to upload ISO to mirror. Check webui for additional information."
-          username: "Concourse-CI"
-      on_success:
-        put: RockNSM-Slack
-        params:
-          text: "Concourse Nightly Release build successful. The prerelease build can be found here <((mirror-uri))|Nightly Release>"
-          username: "Concourse-CI"
+      - get: rock-createiso-git
+      - get: Nightly-Timer
+        trigger: true
+      - task: Download centOS Minimal ISO
+        config:
+          platform: linux
+          image_resource:
+            type: docker-image
+            source: { repository: centos }
+          inputs:
+            - name: rock-createiso-git
+          outputs:
+            - name: centos-minimal-iso
+          run:
+            path: /bin/bash
+            args:
+              - '-c'
+              - 'rock-createiso-git/concourse/download_minimal_iso.sh "$MIRROR_HOST"'
+          params:
+            MIRROR_HOST: ((mirror-host))
+        on_failure:
+          put: RockNSM-Slack
+          params:
+            text: "Concourse Nightly failed to build. Could not retrieve a copy of centos minimal iso."
+            username: "Concourse-CI"
+            # icon_url: URL
+  
+      - task: ROCK Create ISO
+        config:
+          platform: linux
+          image_resource:
+            type: docker-image
+            source: { repository: centos }
+          inputs:
+            - name: rock-createiso-git
+            - name: centos-minimal-iso
+          outputs:
+            - name: rocknsm-iso
+          run:
+            path: /bin/bash
+            args:
+              - '-c'
+              - 'rock-createiso-git/concourse/create_iso.sh "$GPG_KEY_NAME" "$GPG_KEY_PASS" "$GPG_KEY" "$ENABLE_TESTING" "$OFFICIAL_RELEASE" "$PULP_HOST"'
+          params:
+            GPG_KEY: ((gpg-key))
+            GPG_KEY_PASS: ((gpg-passphrase))
+            GPG_KEY_NAME: ((gpg-key-name))
+            ENABLE_TESTING: 1
+            OFFICIAL_RELEASE: 0
+            PULP_HOST: ((pulp-host))
+        on_failure:
+          put: RockNSM-Slack
+          params:
+            text: "Concourse Nightly Failed to build. Task: ROCK Create ISO. Check webui for additional information."
+            username: "Concourse-CI"
+            # icon_url: URL
+      - task: Upload ISO
+        config:
+          platform: linux
+          image_resource:
+            type: docker-image
+            source: { repository: centos }
+          inputs:
+            - name: rock-createiso-git
+            - name: rocknsm-iso
+          run:
+            path: /bin/bash
+            args:
+              - '-c'
+              - 'rock-createiso-git/concourse/upload.sh "$MIRROR_USER" "$MIRROR_PASS" "$MIRROR_HOST" "$MIRROR_REPO" "$MIRROR_PRIVATE" "$MIRROR_PUBLIC"'
+          params:
+            MIRROR_USER: ((mirror-user))
+            MIRROR_PASS: ((mirror-pass))
+            MIRROR_HOST: ((mirror-host))
+            MIRROR_REPO: "testing"
+            MIRROR_PRIVATE: ((mirror-private-key))
+            MIRROR_PUBLIC: ((mirror-public-key))
+        on_failure:
+          put: RockNSM-Slack
+          params:
+            text: "Concourse Nightly Release Failed to upload ISO to mirror. Check webui for additional information."
+            username: "Concourse-CI"
+        on_success:
+          put: RockNSM-Slack
+          params:
+            text: "Concourse Nightly Release build successful. The prerelease build can be found here <((mirror-uri))|Nightly Release>"
+            username: "Concourse-CI"
diff --git a/concourse/pipelines/release/pipeline.yml b/concourse/pipelines/release/pipeline.yml
index 1b6f60b..93a4e81 100644
--- a/concourse/pipelines/release/pipeline.yml
+++ b/concourse/pipelines/release/pipeline.yml
@@ -29,90 +29,90 @@ jobs:
     build_logs_to_retain: 14
     serial: true
     plan:
-    - get: rock-rocknsm-git
-      trigger: true
-    - get: rock-createiso-git
-    - task: Download centOS Minimal ISO
-      config:
-        platform: linux
-        image_resource:
-          type: docker-image
-          source: { repository: centos }
-        inputs:
-          - name: rock-createiso-git
-        outputs:
-          - name: centos-minimal-iso
-        run:
-          path: /bin/bash
-          args:
-            - '-c'
-            - 'rock-createiso-git/concourse/download_minimal_iso.sh "$MIRROR_HOST"'
-        params:
-          MIRROR_HOST: ((mirror-host))
-      on_failure:
-        put: RockNSM-Slack
-        params:
-          text: "Concourse Official Release failed to build. Could not retrieve a copy of centos minimal iso."
-          username: "Concourse-CI"
-          # icon_url: URL
-
-    - task: ROCK Create ISO
-      config:
-        platform: linux
-        image_resource:
-          type: docker-image
-          source: { repository: centos }
-        inputs:
-          - name: rock-createiso-git
-          - name: centos-minimal-iso
-        outputs:
-          - name: rocknsm-iso
-        run:
-          path: /bin/bash
-          args:
-            - '-c'
-            - 'rock-createiso-git/concourse/create_iso.sh "$GPG_KEY_NAME" "$GPG_KEY_PASS" "$GPG_KEY" "$ENABLE_TESTING" "$OFFICIAL_RELEASE" "$PULP_HOST"'
-        params:
-          GPG_KEY: ((gpg-key))
-          GPG_KEY_PASS: ((gpg-passphrase))
-          GPG_KEY_NAME: ((gpg-key-name))
-          ENABLE_TESTING: 0
-          OFFICIAL_RELEASE: 1
-          PULP_HOST: ((pulp-host))
-      on_failure:
-        put: RockNSM-Slack
-        params:
-          text: "Concourse Official Release Failed to build. Task: ROCK Create ISO. Check webui for additional information."
-          username: "Concourse-CI"
-          # icon_url: URL
-    - task: Upload ISO
-      config:
-        platform: linux
-        image_resource:
-          type: docker-image
-          source: { repository: centos }
-        inputs:
-          - name: rocknsm-iso
-          - name: rock-createiso-git
-        run:
-          path: /bin/bash
-          args:
-            - '-c'
-            - 'rock-createiso-git/concourse/upload.sh "$MIRROR_USER" "$MIRROR_PASS" "$MIRROR_HOST" "$MIRROR_REPO" "$MIRROR_PRIVATE" "$MIRROR_PUBLIC"'
-        params:
-          MIRROR_USER: ((mirror-user))
-          MIRROR_PASS: ((mirror-pass))
-          MIRROR_HOST: ((mirror-host))
-          MIRROR_REPO: "stable"
-          MIRROR_PRIVATE: ((mirror-private-key))
-          MIRROR_PUBLIC: ((mirror-public-key))
-      on_failure:
-        put: RockNSM-Slack
-        params:
-          text: "Concourse Official Release Failed to upload ISO to mirror. Check webui for additional information."
-          username: "Concourse-CI"
-      on_success:
-        put: RockNSM-Slack
-        params:
-          text: "Concourse Official Release build successful. The release build can be found here <((mirror-uri))|Official Release>"
-          username: "Concourse-CI"
+      - get: rock-rocknsm-git
+        trigger: true
+      - get: rock-createiso-git
+      - task: Download centOS Minimal ISO
+        config:
+          platform: linux
+          image_resource:
+            type: docker-image
+            source: { repository: centos }
+          inputs:
+            - name: rock-createiso-git
+          outputs:
+            - name: centos-minimal-iso
+          run:
+            path: /bin/bash
+            args:
+              - '-c'
+              - 'rock-createiso-git/concourse/download_minimal_iso.sh "$MIRROR_HOST"'
+          params:
+            MIRROR_HOST: ((mirror-host))
+        on_failure:
+          put: RockNSM-Slack
+          params:
+            text: "Concourse Official Release failed to build. Could not retrieve a copy of centos minimal iso."
+            username: "Concourse-CI"
+            # icon_url: URL
+  
+      - task: ROCK Create ISO
+        config:
+          platform: linux
+          image_resource:
+            type: docker-image
+            source: { repository: centos }
+          inputs:
+            - name: rock-createiso-git
+            - name: centos-minimal-iso
+          outputs:
+            - name: rocknsm-iso
+          run:
+            path: /bin/bash
+            args:
+              - '-c'
+              - 'rock-createiso-git/concourse/create_iso.sh "$GPG_KEY_NAME" "$GPG_KEY_PASS" "$GPG_KEY" "$ENABLE_TESTING" "$OFFICIAL_RELEASE" "$PULP_HOST"'
+          params:
+            GPG_KEY: ((gpg-key))
+            GPG_KEY_PASS: ((gpg-passphrase))
+            GPG_KEY_NAME: ((gpg-key-name))
+            ENABLE_TESTING: 0
+            OFFICIAL_RELEASE: 1
+            PULP_HOST: ((pulp-host))
+        on_failure:
+          put: RockNSM-Slack
+          params:
+            text: "Concourse Official Release Failed to build. Task: ROCK Create ISO. Check webui for additional information."
+            username: "Concourse-CI"
+            # icon_url: URL
+      - task: Upload ISO
+        config:
+          platform: linux
+          image_resource:
+            type: docker-image
+            source: { repository: centos }
+          inputs:
+            - name: rocknsm-iso
+            - name: rock-createiso-git
+          run:
+            path: /bin/bash
+            args:
+              - '-c'
+              - 'rock-createiso-git/concourse/upload.sh "$MIRROR_USER" "$MIRROR_PASS" "$MIRROR_HOST" "$MIRROR_REPO" "$MIRROR_PRIVATE" "$MIRROR_PUBLIC"'
+          params:
+            MIRROR_USER: ((mirror-user))
+            MIRROR_PASS: ((mirror-pass))
+            MIRROR_HOST: ((mirror-host))
+            MIRROR_REPO: "stable"
+            MIRROR_PRIVATE: ((mirror-private-key))
+            MIRROR_PUBLIC: ((mirror-public-key))
+        on_failure:
+          put: RockNSM-Slack
+          params:
+            text: "Concourse Official Release Failed to upload ISO to mirror. Check webui for additional information."
+            username: "Concourse-CI"
+        on_success:
+          put: RockNSM-Slack
+          params:
+            text: "Concourse Official Release build successful. The release build can be found here <((mirror-uri))|Official Release>"
+            username: "Concourse-CI"