From 2f137ffddf91256a35ed84ffad78971864b1b4d3 Mon Sep 17 00:00:00 2001 From: Yuxiang Zhu Date: Feb 19 2019 07:24:24 +0000 Subject: Fix #22: Add id field to container-image artifacts This PR adds the missing `id` field to container-image artifacts. --- diff --git a/examples/container-image.gate.complete.json b/examples/container-image.gate.complete.json index 953fd28..71fd540 100644 --- a/examples/container-image.gate.complete.json +++ b/examples/container-image.gate.complete.json @@ -6,7 +6,8 @@ "nvr": "someapp-2.8.71-7.el7_4", "issuer": "jenkins", "scratch": true, - "source": "git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a" + "source": "git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a", + "id": "someapp@sha256:017eb7de7927da933a04a6c1ff59da0c41dcea194aaa6b5dd7148df286b92433" }, "gate": { "name": "Some Gating Bot", diff --git a/examples/container-image.gate.error.json b/examples/container-image.gate.error.json index 8e0f3b6..1463cfb 100644 --- a/examples/container-image.gate.error.json +++ b/examples/container-image.gate.error.json @@ -6,7 +6,8 @@ "nvr": "someapp-2.8.71-7.el7_4", "issuer": "jenkins", "scratch": true, - "source": "git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a" + "source": "git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a", + "id": "someapp@sha256:017eb7de7927da933a04a6c1ff59da0c41dcea194aaa6b5dd7148df286b92433" }, "gate": { "name": "Some Gating Bot", diff --git a/examples/container-image.gate.queued.json b/examples/container-image.gate.queued.json index 2ba28a2..c9fb0f8 100644 --- a/examples/container-image.gate.queued.json +++ b/examples/container-image.gate.queued.json @@ -6,7 +6,8 @@ "nvr": "someapp-2.8.71-7.el7_4", "issuer": "jenkins", "scratch": true, - "source": "git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a" + "source": "git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a", + "id": "someapp@sha256:017eb7de7927da933a04a6c1ff59da0c41dcea194aaa6b5dd7148df286b92433" }, "gate": { "name": "Some Gating Bot", diff --git a/examples/container-image.gate.running.json b/examples/container-image.gate.running.json index 2ba28a2..c9fb0f8 100644 --- a/examples/container-image.gate.running.json +++ b/examples/container-image.gate.running.json @@ -6,7 +6,8 @@ "nvr": "someapp-2.8.71-7.el7_4", "issuer": "jenkins", "scratch": true, - "source": "git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a" + "source": "git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a", + "id": "someapp@sha256:017eb7de7927da933a04a6c1ff59da0c41dcea194aaa6b5dd7148df286b92433" }, "gate": { "name": "Some Gating Bot", diff --git a/examples/container-image.test.complete.json b/examples/container-image.test.complete.json index 3945232..354c287 100644 --- a/examples/container-image.test.complete.json +++ b/examples/container-image.test.complete.json @@ -23,7 +23,8 @@ "nvr": "someapp-2.8.71-7.el7_4", "issuer": "jenkins", "scratch": true, - "source": "git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a" + "source": "git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a", + "id": "someapp@sha256:017eb7de7927da933a04a6c1ff59da0c41dcea194aaa6b5dd7148df286b92433" }, "system": [{ diff --git a/examples/container-image.test.error.json b/examples/container-image.test.error.json index 2a2af28..884503a 100644 --- a/examples/container-image.test.error.json +++ b/examples/container-image.test.error.json @@ -23,7 +23,8 @@ "nvr": "someapp-2.8.71-7.el7_4", "issuer": "jenkins", "scratch": true, - "source": "git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a" + "source": "git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a", + "id": "someapp@sha256:017eb7de7927da933a04a6c1ff59da0c41dcea194aaa6b5dd7148df286b92433" }, "type": "tier1", "category": "functional", diff --git a/examples/container-image.test.queued.json b/examples/container-image.test.queued.json index 3052a35..51bd673 100644 --- a/examples/container-image.test.queued.json +++ b/examples/container-image.test.queued.json @@ -21,7 +21,8 @@ "nvr": "someapp-2.8.71-7.el7_4", "issuer": "jenkins", "scratch": true, - "source": "git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a" + "source": "git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a", + "id": "someapp@sha256:017eb7de7927da933a04a6c1ff59da0c41dcea194aaa6b5dd7148df286b92433" }, "type": "tier1", "category": "functional", diff --git a/examples/container-image.test.running.json b/examples/container-image.test.running.json index 5021e5f..f815b05 100644 --- a/examples/container-image.test.running.json +++ b/examples/container-image.test.running.json @@ -21,7 +21,8 @@ "nvr": "someapp-2.8.71-7.el7_4", "issuer": "jenkins", "scratch": true, - "source": "git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a" + "source": "git+https://src.fedoraproject.org/rpms/setup.git?#5e0ae23a", + "id": "someapp@sha256:017eb7de7927da933a04a6c1ff59da0c41dcea194aaa6b5dd7148df286b92433" }, "type": "tier1", "category": "functional", diff --git a/schemas/container-image.yaml b/schemas/container-image.yaml index d9b8de0..014ed4b 100644 --- a/schemas/container-image.yaml +++ b/schemas/container-image.yaml @@ -76,6 +76,14 @@ properties: examples: - git+https://github.com/docker/rootfs.git#container:docker type: string + id: + description: + ID of this container image. The value is used to keep this message + consistent across different artifacts. + See https://pagure.io/fedora-ci/messages/issue/22. + examples: + - fedora@sha256:67dad89757a55bfdfabec8abd0e22f8c7c12a1856514726470228063ed86593b + type: string required: - type @@ -83,5 +91,6 @@ required: - digest - issuer - scratch + - id type: object