Merge pull request #237 from lmilbaum/labels

compose-id,id and version-id labels
CentOS · Jan 31, 2024 · 4a01677 · 4a01677
2 parents 5373e9e + 86e8e3d
commit 4a01677
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 0 deletions.
diff --git a/.tekton/centos-bootc-pull-request.yaml b/.tekton/centos-bootc-pull-request.yaml
@@ -29,6 +29,8 @@ spec:
       value: .
     - name: revision
       value: "{{revision}}"
+    - name: config-file
+      value: "centos-bootc-config.json"
   pipelineRef:
     name: ostree-build
   workspaces:

diff --git a/.tekton/centos-bootc-push.yaml b/.tekton/centos-bootc-push.yaml
@@ -29,6 +29,8 @@ spec:
       value: .
     - name: revision
       value: "{{revision}}"
+    - name: config-file
+      value: "centos-bootc-config.json"
   pipelineRef:
     name: ostree-build
   workspaces:

diff --git a/.tekton/fedora-bootc-pull-request.yaml b/.tekton/fedora-bootc-pull-request.yaml
@@ -29,6 +29,8 @@ spec:
       value: .
     - name: revision
       value: "{{revision}}"
+    - name: config-file
+      value: "fedora-bootc-config.json"
   pipelineRef:
     name: ostree-build
   workspaces:

diff --git a/.tekton/fedora-bootc-push.yaml b/.tekton/fedora-bootc-push.yaml
@@ -29,6 +29,8 @@ spec:
       value: .
     - name: revision
       value: "{{revision}}"
+    - name: config-file
+      value: "fedora-bootc-config.json"
   pipelineRef:
     name: ostree-build
   workspaces:

diff --git a/.tekton/ostree-build.yaml b/.tekton/ostree-build.yaml
@@ -74,6 +74,10 @@ spec:
         Image tag expiration time, time values could be something like
         1h, 2d, 3w for hours, days, and weeks, respectively.
       name: image-expires-after
+    - name: config-file
+      description: config file to use for rpm-ostree tool
+      type: string
+      default: ""
   results:
     - description: ""
       name: IMAGE_URL
@@ -232,6 +236,8 @@ spec:
           value: linux/amd64
         - name: BUILDER_IMAGE
           value: quay.io/centos-bootc/builder:latest
+        - name: CONFIG_FILE
+          value: $(params.config-file)
       runAfter:
         - clone-repository
       taskRef:
@@ -267,6 +273,8 @@ spec:
           value: linux/arm64
         - name: BUILDER_IMAGE
           value: quay.io/centos-bootc/builder:latest
+        - name: CONFIG_FILE
+          value: $(params.config-file)
       runAfter:
         - clone-repository-arm64
       taskRef:
@@ -302,6 +310,8 @@ spec:
           value: linux/s390x
         - name: BUILDER_IMAGE
           value: quay.io/centos-bootc/builder:latest
+        - name: CONFIG_FILE
+          value: $(params.config-file)
       runAfter:
         - clone-repository-s390x
       taskRef:
@@ -337,6 +347,8 @@ spec:
           value: linux/ppc64le
         - name: BUILDER_IMAGE
           value: quay.io/centos-bootc/builder:latest
+        - name: CONFIG_FILE
+          value: $(params.config-file)
       runAfter:
         - clone-repository-ppc64le
       taskRef:

diff --git a/centos-bootc-config.json b/centos-bootc-config.json
@@ -0,0 +1,7 @@
+{
+    "Labels": {
+        "redhat.compose-id": "CentOS-Stream-9-20240131.d.0",
+        "redhat.id": "centos",
+        "redhat.version-id": "9"
+    }
+}
diff --git a/fedora-bootc-config.json b/fedora-bootc-config.json
@@ -0,0 +1,7 @@
+{
+    "Labels": {
+        "redhat.compose-id": "Fedora-ELN-20240131.1",
+        "redhat.id": "fedora",
+        "redhat.version-id": "ELN"
+    }
+}