Skip to content

Commit 8f17477

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #60128 from openshift-bot/auto-config-brancher
Automate config brancher by auto-config-brancher job at Mon, 23 Dec 2024 16:04:52 UTC
2 parents 338cbae + f160c05 commit 8f17477

13 files changed

+77
-43
lines changed

‎ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.17.yaml

+15
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,27 @@ base_images:
1515
name: hypershift-tests
1616
namespace: hypershift
1717
tag: latest
18+
ocp_4.17_base-rhel9:
19+
name: 4.17-priv
20+
namespace: ocp-private
21+
tag: base-rhel9
22+
ocp_builder_rhel-9-golang-1.22-openshift-4.17:
23+
name: builder
24+
namespace: ocp
25+
tag: rhel-9-golang-1.22-openshift-4.17
1826
build_root:
1927
from_repository: true
2028
use_build_cache: true
2129
canonical_go_repository: github.com/openshift/hypershift
2230
images:
2331
- dockerfile_path: Dockerfile.control-plane
32+
inputs:
33+
ocp_4.17_base-rhel9:
34+
as:
35+
- registry.ci.openshift.org/ocp/4.17:base-rhel9
36+
ocp_builder_rhel-9-golang-1.22-openshift-4.17:
37+
as:
38+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
2439
to: hypershift
2540
promotion:
2641
to:

‎ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.18.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ images:
6363
src:
6464
as:
6565
- src
66+
optional: true
6667
to: tests-private-ui
6768
- dockerfile_literal: |
6869
FROM bin AS builder

‎ci-operator/config/openshift-priv/thanos/openshift-priv-thanos-master.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
base_images:
2-
ocp_4.18_base-rhel9:
2+
ocp_4.19_base-rhel9:
33
name: 4.19-priv
44
namespace: ocp-private
55
tag: base-rhel9
6-
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
6+
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
77
name: builder
88
namespace: ocp
9-
tag: rhel-9-golang-1.22-openshift-4.18
9+
tag: rhel-9-golang-1.23-openshift-4.19
1010
build_root:
1111
from_repository: true
1212
canonical_go_repository: github.com/openshift/thanos
1313
images:
1414
- dockerfile_path: Dockerfile.ocp
1515
inputs:
16-
ocp_4.18_base-rhel9:
16+
ocp_4.19_base-rhel9:
1717
as:
18-
- registry.ci.openshift.org/ocp/4.18:base-rhel9
19-
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
18+
- registry.ci.openshift.org/ocp/4.19:base-rhel9
19+
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
2020
as:
21-
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
21+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
2222
to: thanos
2323
promotion:
2424
to:

‎ci-operator/config/openshift-priv/thanos/openshift-priv-thanos-release-4.19.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
base_images:
2-
ocp_4.18_base-rhel9:
2+
ocp_4.19_base-rhel9:
33
name: 4.19-priv
44
namespace: ocp-private
55
tag: base-rhel9
6-
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
6+
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
77
name: builder
88
namespace: ocp
9-
tag: rhel-9-golang-1.22-openshift-4.18
9+
tag: rhel-9-golang-1.23-openshift-4.19
1010
build_root:
1111
from_repository: true
1212
canonical_go_repository: github.com/openshift/thanos
1313
images:
1414
- dockerfile_path: Dockerfile.ocp
1515
inputs:
16-
ocp_4.18_base-rhel9:
16+
ocp_4.19_base-rhel9:
1717
as:
18-
- registry.ci.openshift.org/ocp/4.18:base-rhel9
19-
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
18+
- registry.ci.openshift.org/ocp/4.19:base-rhel9
19+
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
2020
as:
21-
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
21+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
2222
to: thanos
2323
promotion:
2424
to:

‎ci-operator/config/openshift-priv/thanos/openshift-priv-thanos-release-4.20.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
base_images:
2-
ocp_4.18_base-rhel9:
2+
ocp_4.19_base-rhel9:
33
name: 4.20-priv
44
namespace: ocp-private
55
tag: base-rhel9
6-
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
6+
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
77
name: builder
88
namespace: ocp
9-
tag: rhel-9-golang-1.22-openshift-4.18
9+
tag: rhel-9-golang-1.23-openshift-4.19
1010
build_root:
1111
from_repository: true
1212
canonical_go_repository: github.com/openshift/thanos
1313
images:
1414
- dockerfile_path: Dockerfile.ocp
1515
inputs:
16-
ocp_4.18_base-rhel9:
16+
ocp_4.19_base-rhel9:
1717
as:
18-
- registry.ci.openshift.org/ocp/4.18:base-rhel9
19-
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
18+
- registry.ci.openshift.org/ocp/4.19:base-rhel9
19+
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
2020
as:
21-
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
21+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
2222
to: thanos
2323
promotion:
2424
to:

‎ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.17.yaml

+15
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,26 @@ base_images:
1515
name: hypershift-tests
1616
namespace: hypershift
1717
tag: latest
18+
ocp_4.17_base-rhel9:
19+
name: "4.17"
20+
namespace: ocp
21+
tag: base-rhel9
22+
ocp_builder_rhel-9-golang-1.22-openshift-4.17:
23+
name: builder
24+
namespace: ocp
25+
tag: rhel-9-golang-1.22-openshift-4.17
1826
build_root:
1927
from_repository: true
2028
use_build_cache: true
2129
images:
2230
- dockerfile_path: Dockerfile.control-plane
31+
inputs:
32+
ocp_4.17_base-rhel9:
33+
as:
34+
- registry.ci.openshift.org/ocp/4.17:base-rhel9
35+
ocp_builder_rhel-9-golang-1.22-openshift-4.17:
36+
as:
37+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
2338
to: hypershift
2439
promotion:
2540
to:

‎ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.17__okd-scos.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ images:
2222
ocp_builder_rhel-9-golang-1.22-openshift-4.17:
2323
as:
2424
- builder
25+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
2526
to: hypershift
2627
promotion:
2728
to:

‎ci-operator/config/openshift/thanos/openshift-thanos-master.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
base_images:
2-
ocp_4.18_base-rhel9:
2+
ocp_4.19_base-rhel9:
33
name: "4.19"
44
namespace: ocp
55
tag: base-rhel9
6-
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
6+
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
77
name: builder
88
namespace: ocp
9-
tag: rhel-9-golang-1.22-openshift-4.18
9+
tag: rhel-9-golang-1.23-openshift-4.19
1010
build_root:
1111
from_repository: true
1212
images:
1313
- dockerfile_path: Dockerfile.ocp
1414
inputs:
15-
ocp_4.18_base-rhel9:
15+
ocp_4.19_base-rhel9:
1616
as:
17-
- registry.ci.openshift.org/ocp/4.18:base-rhel9
18-
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
17+
- registry.ci.openshift.org/ocp/4.19:base-rhel9
18+
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
1919
as:
20-
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
20+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
2121
to: thanos
2222
promotion:
2323
to:

‎ci-operator/config/openshift/thanos/openshift-thanos-master__okd-scos.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ images:
2222
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
2323
as:
2424
- builder
25-
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
25+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
2626
to: thanos
2727
promotion:
2828
to:

‎ci-operator/config/openshift/thanos/openshift-thanos-release-4.19.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
base_images:
2-
ocp_4.18_base-rhel9:
2+
ocp_4.19_base-rhel9:
33
name: "4.19"
44
namespace: ocp
55
tag: base-rhel9
6-
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
6+
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
77
name: builder
88
namespace: ocp
9-
tag: rhel-9-golang-1.22-openshift-4.18
9+
tag: rhel-9-golang-1.23-openshift-4.19
1010
build_root:
1111
from_repository: true
1212
images:
1313
- dockerfile_path: Dockerfile.ocp
1414
inputs:
15-
ocp_4.18_base-rhel9:
15+
ocp_4.19_base-rhel9:
1616
as:
17-
- registry.ci.openshift.org/ocp/4.18:base-rhel9
18-
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
17+
- registry.ci.openshift.org/ocp/4.19:base-rhel9
18+
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
1919
as:
20-
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
20+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
2121
to: thanos
2222
promotion:
2323
to:

‎ci-operator/config/openshift/thanos/openshift-thanos-release-4.20.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
base_images:
2-
ocp_4.18_base-rhel9:
2+
ocp_4.19_base-rhel9:
33
name: "4.20"
44
namespace: ocp
55
tag: base-rhel9
6-
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
6+
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
77
name: builder
88
namespace: ocp
9-
tag: rhel-9-golang-1.22-openshift-4.18
9+
tag: rhel-9-golang-1.23-openshift-4.19
1010
build_root:
1111
from_repository: true
1212
images:
1313
- dockerfile_path: Dockerfile.ocp
1414
inputs:
15-
ocp_4.18_base-rhel9:
15+
ocp_4.19_base-rhel9:
1616
as:
17-
- registry.ci.openshift.org/ocp/4.18:base-rhel9
18-
ocp_builder_rhel-9-golang-1.22-openshift-4.18:
17+
- registry.ci.openshift.org/ocp/4.19:base-rhel9
18+
ocp_builder_rhel-9-golang-1.23-openshift-4.19:
1919
as:
20-
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
20+
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
2121
to: thanos
2222
promotion:
2323
to:

‎clusters/hosted-mgmt/hive/pools/ocp-release-4.15.42-x86-64-for-4.15.0-0-to-4.16.0-0_clusterimageset.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ kind: ClusterImageSet
33
metadata:
44
annotations:
55
version_lower: 4.15.0-0
6+
version_stream: 4-stable
67
version_upper: 4.16.0-0
78
creationTimestamp: null
89
name: ocp-release-4.15.42-x86-64-for-4.15.0-0-to-4.16.0-0

‎clusters/hosted-mgmt/hive/pools/ocp-release-4.17.10-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ kind: ClusterImageSet
33
metadata:
44
annotations:
55
version_lower: 4.17.0-0
6+
version_stream: 4-stable
67
version_upper: 4.18.0-0
78
creationTimestamp: null
89
name: ocp-release-4.17.10-x86-64-for-4.17.0-0-to-4.18.0-0

0 commit comments

Comments
 (0)