Updated pipeline config

rocknsm · Oct 28, 2021 · 86222e6 · 86222e6
1 parent 44f2b18
commit 86222e6
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 57 deletions.
diff --git a/concourse/pipelines/manual/pipeline.yml b/concourse/pipelines/manual/pipeline.yml
@@ -12,23 +12,23 @@ resources:
       uri: https://github.com/rocknsm/rock-createiso.git
       branch: master
 
-  - name: RockNSM-Slack
+  - name: rocknsm-slack
     type: slack-notification
     source:
       url: ((slack-webhook))
 
 jobs:
-  - name: RockNSM Create ISO
+  - name: rocknsm_create_iso
     build_logs_to_retain: 14
     serial: true
     plan:
       - get: rock-createiso-git
-      - task: Download centOS Minimal ISO
+      - task: download_centos_minimal_iso
         config:
           platform: linux
           image_resource:
             type: docker-image
-            source: { repository: centos }
+            source: { repository: centos, tag: 7 }
           inputs:
             - name: rock-createiso-git
           outputs:
@@ -41,18 +41,18 @@ jobs:
           params:
             MIRROR_HOST: ((mirror-host))
         on_failure:
-          put: RockNSM-Slack
+          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
+      - task: rock_create_iso
         config:
           platform: linux
           image_resource:
             type: docker-image
-            source: { repository: centos }
+            source: { repository: centos, tag: 7 }
           inputs:
             - name: rock-createiso-git
             - name: centos-minimal-iso
@@ -71,17 +71,17 @@ jobs:
             OFFICIAL_RELEASE: 0
             PULP_HOST: ((pulp-host))
         on_failure:
-          put: RockNSM-Slack
+          put: rocknsm-slack
           params:
-            text: "Concourse Manual Failed to build. Task: ROCK Create ISO. Check webui for additional information."
+            text: "Concourse Manual Failed to build. Task: rock_create_iso. Check webui for additional information."
             username: "Concourse-CI"
             # icon_url: URL
-      - task: Upload ISO
+      - task: upload_iso
         config:
           platform: linux
           image_resource:
             type: docker-image
-            source: { repository: centos }
+            source: { repository: centos, tag: 7 }
           inputs:
             - name: rocknsm-iso
             - name: rock-createiso-git
@@ -99,12 +99,12 @@ jobs:
             MIRROR_PUBLIC: ((mirror-public-key))
             MIRROR_IP: ((mirror-ip))
         on_failure:
-          put: RockNSM-Slack
+          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
+          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
@@ -12,31 +12,31 @@ resources:
       uri: https://github.com/rocknsm/rock-createiso.git
       branch: master
 
-  - name: RockNSM-Slack
+  - name: rocknsm-slack
     type: slack-notification
     source:
       url: ((slack-webhook))
 
-  - name: Nightly-Timer
+  - name: nightly-timer
     type: time
     source:
       start: 8:00 AM
       stop: 8:15 AM
 
 jobs:
-  - name: RockNSM Create ISO
+  - name: rocknsm_create_iso
     build_logs_to_retain: 14
     serial: true
     plan:
       - get: rock-createiso-git
-      - get: Nightly-Timer
+      - get: nightly-timer
         trigger: true
-      - task: Download centOS Minimal ISO
+      - task: download_centos_minimal_iso
         config:
           platform: linux
           image_resource:
             type: docker-image
-            source: { repository: centos }
+            source: { repository: centos, tag: 7 }
           inputs:
             - name: rock-createiso-git
           outputs:
@@ -49,18 +49,18 @@ jobs:
           params:
             MIRROR_HOST: ((mirror-host))
         on_failure:
-          put: RockNSM-Slack
+          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
+      - task: rock_create_iso
         config:
           platform: linux
           image_resource:
             type: docker-image
-            source: { repository: centos }
+            source: { repository: centos, tag: 7 }
           inputs:
             - name: rock-createiso-git
             - name: centos-minimal-iso
@@ -79,39 +79,40 @@ jobs:
             OFFICIAL_RELEASE: 0
             PULP_HOST: ((pulp-host))
         on_failure:
-          put: RockNSM-Slack
+          put: rocknsm-slack
           params:
-            text: "Concourse Nightly Failed to build. Task: ROCK Create ISO. Check webui for additional information."
+            text: "Concourse Nightly Failed to build. Task: rock_create_iso. Check webui for additional information."
             username: "Concourse-CI"
             # icon_url: URL
-      - task: Upload ISO
+      - task: upload_iso
         config:
           platform: linux
           image_resource:
             type: docker-image
-            source: { repository: centos }
+            source: { repository: centos, tag: 7 }
           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"'
+              - 'rock-createiso-git/concourse/upload.sh "$MIRROR_USER" "$MIRROR_PASS" "$MIRROR_HOST" "$MIRROR_REPO" "$MIRROR_PRIVATE" "$MIRROR_PUBLIC" "$MIRROR_IP"'
           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))
+            MIRROR_IP: ((mirror-ip))
         on_failure:
-          put: RockNSM-Slack
+          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
+          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/prerelease/pipeline.yml b/concourse/pipelines/prerelease/pipeline.yml
@@ -12,23 +12,23 @@ resources:
       uri: https://github.com/rocknsm/rock-createiso.git
       branch: master
 
-  - name: RockNSM-Slack
+  - name: rocknsm-slack
     type: slack-notification
     source:
       url: ((slack-webhook))
 
 jobs:
-  - name: RockNSM Create ISO
+  - name: rocknsm-create-iso
     build_logs_to_retain: 14
     serial: true
     plan:
       - get: rock-createiso-git
-      - task: Download centOS Minimal ISO
+      - task: download-centos-minimal-iso
         config:
           platform: linux
           image_resource:
             type: docker-image
-            source: { repository: centos }
+            source: { repository: centos, tag: 7 }
           inputs:
             - name: rock-createiso-git
           outputs:
@@ -41,18 +41,18 @@ jobs:
           params:
             MIRROR_HOST: ((mirror-host))
         on_failure:
-          put: RockNSM-Slack
+          put: rocknsm-slack
           params:
             text: "Concourse Pre-Release failed to build. Could not retrieve a copy of centos minimal iso."
             username: "Concourse-CI"
             # icon_url: URL
 
-      - task: ROCK Create ISO
+      - task: rock-create-iso
         config:
           platform: linux
           image_resource:
             type: docker-image
-            source: { repository: centos }
+            source: { repository: centos, tag: 7 }
           inputs:
             - name: rock-createiso-git
             - name: centos-minimal-iso
@@ -71,39 +71,40 @@ jobs:
             OFFICIAL_RELEASE: 0
             PULP_HOST: ((pulp-host))
         on_failure:
-          put: RockNSM-Slack
+          put: rocknsm-slack
           params:
-            text: "Concourse Pre-Release Failed to build. Task: ROCK Create ISO. Check webui for additional information."
+            text: "Concourse Pre-Release Failed to build. Task: rock-create-iso. Check webui for additional information."
             username: "Concourse-CI"
             # icon_url: URL
-      - task: Upload ISO
+      - task: upload-iso
         config:
           platform: linux
           image_resource:
             type: docker-image
-            source: { repository: centos }
+            source: { repository: centos, tag: 7 }
           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"'
+              - 'rock-createiso-git/concourse/upload.sh "$MIRROR_USER" "$MIRROR_PASS" "$MIRROR_HOST" "$MIRROR_REPO" "$MIRROR_PRIVATE" "$MIRROR_PUBLIC" "$MIRROR_IP"'
           params:
             MIRROR_USER: ((mirror-user))
             MIRROR_PASS: ((mirror-pass))
             MIRROR_HOST: ((mirror-host))
             MIRROR_REPO: "prerelease"
             MIRROR_PRIVATE: ((mirror-private-key))
             MIRROR_PUBLIC: ((mirror-public-key))
+            MIRROR_IP: ((mirror-ip))
         on_failure:
-          put: RockNSM-Slack
+          put: rocknsm-slack
           params:
             text: "Concourse Pre-Release Failed to upload ISO to mirror. Check webui for additional information."
             username: "Concourse-CI"
         on_success:
-          put: RockNSM-Slack
+          put: rocknsm-slack
           params:
             text: "Concourse Pre-Release build successful. The release build can be found here <((mirror-uri))|Pre-Release>"
             username: "Concourse-CI"
diff --git a/concourse/pipelines/release/pipeline.yml b/concourse/pipelines/release/pipeline.yml
@@ -19,25 +19,25 @@ resources:
       branch: master
       tag_filter: "rock-[[:digit:]].[[:digit:]].[[:digit:]]-[[:digit:]]"
 
-  - name: RockNSM-Slack
+  - name: rocknsm-slack
     type: slack-notification
     source:
       url: ((slack-webhook))
 
 jobs:
-  - name: RockNSM Create ISO
+  - name: rocknsm-create-iso
     build_logs_to_retain: 14
     serial: true
     plan:
       - get: rock-rocknsm-git
         trigger: true
       - get: rock-createiso-git
-      - task: Download centOS Minimal ISO
+      - task: download-centos-minimal-iso
         config:
           platform: linux
           image_resource:
             type: docker-image
-            source: { repository: centos }
+            source: { repository: centos, tag: 7 }
           inputs:
             - name: rock-createiso-git
           outputs:
@@ -50,18 +50,18 @@ jobs:
           params:
             MIRROR_HOST: ((mirror-host))
         on_failure:
-          put: RockNSM-Slack
+          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
+      - task: rock-create-iso
         config:
           platform: linux
           image_resource:
             type: docker-image
-            source: { repository: centos }
+            source: { repository: centos, tag: 7 }
           inputs:
             - name: rock-createiso-git
             - name: centos-minimal-iso
@@ -80,39 +80,40 @@ jobs:
             OFFICIAL_RELEASE: 1
             PULP_HOST: ((pulp-host))
         on_failure:
-          put: RockNSM-Slack
+          put: rocknsm-slack
           params:
-            text: "Concourse Official Release Failed to build. Task: ROCK Create ISO. Check webui for additional information."
+            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
+      - task: upload-iso
         config:
           platform: linux
           image_resource:
             type: docker-image
-            source: { repository: centos }
+            source: { repository: centos, tag: 7 }
           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"'
+              - 'rock-createiso-git/concourse/upload.sh "$MIRROR_USER" "$MIRROR_PASS" "$MIRROR_HOST" "$MIRROR_REPO" "$MIRROR_PRIVATE" "$MIRROR_PUBLIC" "$MIRROR_IP"'
           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))
+            MIRROR_IP: ((mirror-ip))
         on_failure:
-          put: RockNSM-Slack
+          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
+          put: rocknsm-slack
           params:
             text: "Concourse Official Release build successful. The release build can be found here <((mirror-uri))|Official Release>"
             username: "Concourse-CI"