Skip to content

Commit d12641f

Browse files
committed
Bump boilerplate to 8.0.0
1 parent 4b2a2f2 commit d12641f

File tree

12 files changed

+43
-28
lines changed

12 files changed

+43
-28
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: boilerplate
33
namespace: openshift
4-
tag: image-v7.4.0
4+
tag: image-v8.0.0

OWNERS_ALIASES

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,18 @@ aliases:
1010
- luis-falcon
1111
- reedcort
1212
srep-functional-team-fedramp:
13-
- tonytheleg
1413
- theautoroboto
15-
- rhdedgar
1614
- katherinelc321
1715
- rojasreinold
1816
- fsferraz-rh
17+
- jonahbrawley
18+
- digilink
19+
- annelson-rh
20+
- pheckenlWork
21+
- ironcladlou
22+
- MrSantamaria
23+
- PeterCSRE
24+
- cjnovak98
1925
srep-functional-team-hulk:
2026
- ravitri
2127
- devppratik
@@ -41,6 +47,7 @@ aliases:
4147
- aliceh
4248
- anispate
4349
- clcollins
50+
- jimdaga
4451
- Mhodesty
4552
- nephomaniac
4653
- tnierman

boilerplate/_data/backing-image-tag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
image-v7.4.0
1+
image-v8.0.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b655ba1347f9bd549afec9f383b5154ca4747c37
1+
3bad269ad200e258a0572566f6e5f08a88b2a8c4

boilerplate/_lib/boilerplate-commit

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,7 @@ elif grep -q '^ M boilerplate/_data/last-boilerplate-commit$' $git_status; then
5656
bp_compare_url="https://github.com/openshift/boilerplate/compare/$bp_commit_change"
5757
# Generate the commit history for this range. This will go in the commit message.
5858
(
59-
if [[ -z "${BOILERPLATE_IN_CI}" ]]; then
60-
git clone "${BOILERPLATE_GIT_REPO}" "${bp_clone}"
61-
else
62-
# HACK: We can't get around safe.directory in CI, so just leverage cp instead of git
63-
cp -r /go/src/github.com/openshift/boilerplate/* "${bp_clone}"
64-
cp -r /go/src/github.com/openshift/boilerplate/.git "${bp_clone}"
65-
fi
59+
git clone "${BOILERPLATE_GIT_REPO}" "${bp_clone}"
6660
cd "${bp_clone}"
6761
# Matches promote.sh
6862
git log --no-merges --pretty=format:'commit: %H%nauthor: %an%n%s%n%n%b%n%n' $bp_commit_change > $bp_log

boilerplate/openshift/golang-osd-e2e/e2e-template.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ parameters:
3030
required: true
3131
- name: LOG_BUCKET
3232
value: 'osde2e-logs'
33+
- name: USE_EXISTING_CLUSTER
34+
value: 'TRUE'
3335
objects:
3436
- apiVersion: batch/v1
3537
kind: Job
@@ -77,4 +79,8 @@ objects:
7779
- name: GCP_CREDS_JSON
7880
value: ${GCP_CREDS_JSON}
7981
- name: LOG_BUCKET
80-
value: ${LOG_BUCKET}
82+
value: ${LOG_BUCKET}
83+
- name: USE_EXISTING_CLUSTER
84+
value: ${USE_EXISTING_CLUSTER}
85+
- name: CAD_PAGERDUTY_ROUTING_KEY
86+
value: ${CAD_PAGERDUTY_ROUTING_KEY}

boilerplate/openshift/golang-osd-e2e/update

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ OPERATOR_NAME_CAMEL_CASE=${OPERATOR_PROPER_NAME// /}
2121

2222
mkdir -p "${E2E_SUITE_DIRECTORY}"
2323

24-
E2E_SUITE_BUILDER_IMAGE=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19
24+
E2E_SUITE_BUILDER_IMAGE=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
2525
if [[ -n ${KONFLUX_BUILDS} ]]; then
26-
E2E_SUITE_BUILDER_IMAGE="brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.23"
26+
E2E_SUITE_BUILDER_IMAGE="brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24"
2727
fi
2828

2929
echo "syncing ${E2E_SUITE_DIRECTORY}/Dockerfile"
@@ -109,4 +109,4 @@ sed -e "s/\${OPERATOR_NAME}/${OPERATOR_NAME}/" $(dirname $0)/e2e-template.yml >"
109109
# todo: remove after file is renamed in ALL consumer repos
110110
if [ -f "${E2E_SUITE_DIRECTORY}/test-harness-template.yml" ]; then
111111
rm -f "${E2E_SUITE_DIRECTORY}/test-harness-template.yml"
112-
fi
112+
fi

boilerplate/openshift/osd-container-image/OWNERS_ALIASES

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,18 @@ aliases:
1010
- luis-falcon
1111
- reedcort
1212
srep-functional-team-fedramp:
13-
- tonytheleg
1413
- theautoroboto
15-
- rhdedgar
1614
- katherinelc321
1715
- rojasreinold
1816
- fsferraz-rh
17+
- jonahbrawley
18+
- digilink
19+
- annelson-rh
20+
- pheckenlWork
21+
- ironcladlou
22+
- MrSantamaria
23+
- PeterCSRE
24+
- cjnovak98
1925
srep-functional-team-hulk:
2026
- ravitri
2127
- devppratik
@@ -41,6 +47,7 @@ aliases:
4147
- aliceh
4248
- anispate
4349
- clcollins
50+
- jimdaga
4451
- Mhodesty
4552
- nephomaniac
4653
- tnierman

boilerplate/update

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,8 @@ EOF
109109
fi
110110
BP_CLONE="$(mktemp -d)"
111111

112-
if [[ -z "${BOILERPLATE_IN_CI}" ]]; then
113-
${BOILERPLATE_GIT_CLONE} "${BOILERPLATE_GIT_REPO}" "${BP_CLONE}"
114-
else
115-
# HACK: We can't get around safe.directory in CI, so just leverage cp instead of git
116-
cp -rf /go/src/github.com/openshift/boilerplate/* "${BP_CLONE}"
117-
cp -rf /go/src/github.com/openshift/boilerplate/.git "${BP_CLONE}"
118-
fi
112+
${BOILERPLATE_GIT_CLONE} "${BOILERPLATE_GIT_REPO}" "${BP_CLONE}"
113+
119114
echo "Updating the update script."
120115
rsync -a "${BP_CLONE}/boilerplate/update" "$0"
121116
echo "Copying utilities"

build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/redhat-services-prod/openshift/boilerplate:image-v7.4.0 as builder
1+
FROM quay.io/redhat-services-prod/openshift/boilerplate:image-v8.0.0 as builder
22

33
ADD . /opt
44
WORKDIR /opt

0 commit comments

Comments
 (0)