Skip to content

Commit bc36c6c

Browse files
authored
openshift/os: adapt for more build-args changes (#79631)
We added the OPENSHIFT_VERSION and YUM_REPO_NAMES build args in openshift/os#1935 so let's add them here. Also drop the quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos references because we don't have that defined in our containerfile anymore.
1 parent 9f060a9 commit bc36c6c

4 files changed

Lines changed: 34 additions & 10 deletions

File tree

ci-operator/config/openshift/os/openshift-os-master.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,18 @@ images:
1717
- build_args:
1818
- name: OPENSHIFT_CI
1919
value: "1"
20+
- name: OPENSHIFT_VERSION
21+
value: "5.0"
22+
- name: YUM_REPO_NAMES
23+
value: rhel-9.8-baseos,rhel-9.8-appstream,rhel-9.8-early-kernel,rhel-9.8-fast-datapath,rhel-9.8-server-ose-5.0
2024
- name: IMAGE_NAME
2125
value: openshift/ose-rhel-coreos-9
2226
- name: IMAGE_CPE
23-
value: cpe:/a:redhat:openshift:4.22::el9
27+
value: cpe:/a:redhat:openshift:5.0::el9
2428
dockerfile_path: Containerfile
2529
inputs:
2630
rhel-coreos-base:
2731
as:
28-
- quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos
2932
- ${IMAGE_FROM}
3033
to: rhel-coreos
3134
- build_args:
@@ -40,10 +43,14 @@ images:
4043
- build_args:
4144
- name: OPENSHIFT_CI
4245
value: "1"
46+
- name: OPENSHIFT_VERSION
47+
value: "5.0"
48+
- name: YUM_REPO_NAMES
49+
value: rhel-10.2-baseos,rhel-10.2-appstream,rhel-10.2-early-kernel,rhel-10.2-fast-datapath,rhel-10.2-server-ose-5.0
4350
- name: IMAGE_NAME
4451
value: openshift/ose-rhel-coreos-10
4552
- name: IMAGE_CPE
46-
value: cpe:/a:redhat:openshift:4.22::el10
53+
value: cpe:/a:redhat:openshift:5.0::el10
4754
dockerfile_path: Containerfile
4855
inputs:
4956
rhel-coreos-base-10:

ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@ images:
1717
- build_args:
1818
- name: OPENSHIFT_CI
1919
value: "1"
20+
- name: OPENSHIFT_VERSION
21+
value: "5.0"
22+
- name: YUM_REPO_NAMES
23+
value: c10s-baseos,c10s-appstream,c10s-sig-nfv,c10s-sig-cloud-okd,rhel-10.2-server-ose-5.0
2024
dockerfile_path: Containerfile
2125
inputs:
2226
stream-coreos-base:
2327
as:
24-
- quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos
2528
- ${IMAGE_FROM}
2629
to: os-image
2730
- build_args:

ci-operator/config/openshift/os/openshift-os-release-5.0.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,18 @@ images:
1717
- build_args:
1818
- name: OPENSHIFT_CI
1919
value: "1"
20+
- name: OPENSHIFT_VERSION
21+
value: "5.0"
22+
- name: YUM_REPO_NAMES
23+
value: rhel-9.8-baseos,rhel-9.8-appstream,rhel-9.8-early-kernel,rhel-9.8-fast-datapath,rhel-9.8-server-ose-5.0
2024
- name: IMAGE_NAME
2125
value: openshift/ose-rhel-coreos-9
2226
- name: IMAGE_CPE
23-
value: cpe:/a:redhat:openshift:4.22::el9
27+
value: cpe:/a:redhat:openshift:5.0::el9
2428
dockerfile_path: Containerfile
2529
inputs:
2630
rhel-coreos-base:
2731
as:
28-
- quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos
2932
- ${IMAGE_FROM}
3033
to: rhel-coreos
3134
- build_args:
@@ -40,10 +43,14 @@ images:
4043
- build_args:
4144
- name: OPENSHIFT_CI
4245
value: "1"
46+
- name: OPENSHIFT_VERSION
47+
value: "5.0"
48+
- name: YUM_REPO_NAMES
49+
value: rhel-10.2-baseos,rhel-10.2-appstream,rhel-10.2-early-kernel,rhel-10.2-fast-datapath,rhel-10.2-server-ose-5.0
4350
- name: IMAGE_NAME
4451
value: openshift/ose-rhel-coreos-10
4552
- name: IMAGE_CPE
46-
value: cpe:/a:redhat:openshift:4.22::el10
53+
value: cpe:/a:redhat:openshift:5.0::el10
4754
dockerfile_path: Containerfile
4855
inputs:
4956
rhel-coreos-base-10:

ci-operator/config/openshift/os/openshift-os-release-5.1.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,18 @@ images:
1717
- build_args:
1818
- name: OPENSHIFT_CI
1919
value: "1"
20+
- name: OPENSHIFT_VERSION
21+
value: "5.1"
22+
- name: YUM_REPO_NAMES
23+
value: rhel-9.8-baseos,rhel-9.8-appstream,rhel-9.8-early-kernel,rhel-9.8-fast-datapath,rhel-9.8-server-ose-5.1
2024
- name: IMAGE_NAME
2125
value: openshift/ose-rhel-coreos-9
2226
- name: IMAGE_CPE
23-
value: cpe:/a:redhat:openshift:4.22::el9
27+
value: cpe:/a:redhat:openshift:5.1::el9
2428
dockerfile_path: Containerfile
2529
inputs:
2630
rhel-coreos-base:
2731
as:
28-
- quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos
2932
- ${IMAGE_FROM}
3033
to: rhel-coreos
3134
- build_args:
@@ -40,10 +43,14 @@ images:
4043
- build_args:
4144
- name: OPENSHIFT_CI
4245
value: "1"
46+
- name: OPENSHIFT_VERSION
47+
value: "5.1"
48+
- name: YUM_REPO_NAMES
49+
value: rhel-10.2-baseos,rhel-10.2-appstream,rhel-10.2-early-kernel,rhel-10.2-fast-datapath,rhel-10.2-server-ose-5.1
4350
- name: IMAGE_NAME
4451
value: openshift/ose-rhel-coreos-10
4552
- name: IMAGE_CPE
46-
value: cpe:/a:redhat:openshift:4.22::el10
53+
value: cpe:/a:redhat:openshift:5.1::el10
4754
dockerfile_path: Containerfile
4855
inputs:
4956
rhel-coreos-base-10:

0 commit comments

Comments
 (0)