Merge okd-coreos-all pipeline with okd-coreos-all-layered

Author: sherine-k

base/tekton.dev/pipelines/okd-coreos-all-layered.yaml

@@ -26,10 +26,13 @@ spec:
       default: "quay.io/okd"
       type: string
     - name: baseos-container-image-name
-      default: "centos-stream-coreos-9"
+      default: "stream-coreos"
+      type: string
+    - name: layered-os-container-image-name
+      default: "stream-coreos-okd"
       type: string
     - name: extensions-container-image-name
-      default: "centos-stream-coreos-9-extensions"
+      default: "stream-coreos-extensions"
       type: string
     - name: upload-container-images
       default: "false"
@@ -111,14 +114,23 @@ spec:
         - name: ws
           workspace: shared-workspace
     - name: cosa-test
+      taskRef:
+        kind: Task
+        name: cosa-test
       params:
         - name: variant
           value: $(params.variant)
       runAfter:
         - cosa-build-baseos
+      workspaces:
+        - name: ws
+          workspace: shared-workspace
+    - name: build-layer
+      runAfter:
+        - cosa-test
       taskRef:
         kind: Task
-        name: cosa-test
+        name: build-layer
       workspaces:
         - name: ws
           workspace: shared-workspace
@@ -136,7 +148,7 @@ spec:
           workspace: shared-workspace
     - name: cosa-buildextend
       runAfter:
-        - cosa-test
+        - cosa-build-extensions
       taskRef:
         kind: Task
         name: cosa-buildextend
@@ -254,16 +266,24 @@ spec:
         - name: s3creds
           workspace: s3-credentials
         - name: ws
-          workspace: shared-workspace
-    - name: build-layer
-      runAfter:
-        - cosa-generate-release-meta
+          workspace: shared-workspace        
+    - name: cosa-upload-scosokd
       taskRef:
         kind: Task
-        name: build-layer
+        name: cosa-push-layered-container
+      runAfter:
+        - build-layer 
+        - cosa-generate-release-meta
       workspaces:
         - name: ws
-          workspace: shared-workspace   
+          workspace: shared-workspace  
+      when:
+      - input: $(params.upload-container-images)
+        operator: in
+        values: ["true"]
+      - input: $(tasks.build-layer.results.output)
+        operator: in
+        values: ["OK"]
   finally:
     - name: notify-matrix
       when: 

base/tekton.dev/pipelines/okd-coreos.yaml

@@ -55,7 +55,9 @@ spec:
         # podman tag localhost/ostree-okd quay.io/okd/stream-coreos-okd
         # podman push  quay.io/okd/stream-coreos-okd
         # TODO Allow for pulling previously built base image, and for pushing the layered image
-
+        printf "%s" "OK" > $(results.output.path)
+  results:
+    - name: output
   workspaces:
     - mountPath: /srv
       name: ws

base/tekton.dev/tasks/build-layer.yaml

@@ -19,9 +19,11 @@ spec:
   - name: target-registry
     default: "quay.io/okd"
   - name: baseos-container-image-name
-    default: "centos-stream-coreos-9"
+    default: "stream-coreos"
+  - name: layered-os-container-image-name
+    default: "stream-coreos-okd"
   - name: extensions-container-image-name
-    default: "centos-stream-coreos-9-extensions"
+    default: "stream-coreos-extensions"
   - name: upload-container-images
     default: "true"
   - name: tag-latest
@@ -71,6 +73,8 @@ spec:
           value: $(tt.params.target-registry)
         - name: baseos-container-image-name
           value: $(tt.params.baseos-container-image-name)
+        - name: layered-os-container-image-name
+          value: $(tt.params.layered-os-container-image-name)
         - name: extensions-container-image-name
           value: $(tt.params.extensions-container-image-name)
         - name: upload-container-images

base/triggers.tekton.dev/triggertemplates/okd-coreos-prod.yaml

@@ -28,9 +28,11 @@ spec:
     - name: target-registry
       value: "quay.io/okd"
     - name: baseos-container-image-name
-      value: "centos-stream-coreos-9"
+      value: "stream-coreos"
+    - name: layered-os-container-image-name
+      value: "stream-coreos-okd"
     - name: extensions-container-image-name
-      value: "centos-stream-coreos-9-extensions"
+      value: "stream-coreos-extensions"
     - name: s3-bucket-name
       value: "okd-scos"
     - name: s3-endpoint-url