File tree Expand file tree Collapse file tree 12 files changed +43
-28
lines changed Expand file tree Collapse file tree 12 files changed +43
-28
lines changed Original file line number Diff line number Diff line change 1
1
build_root_image :
2
2
name : boilerplate
3
3
namespace : openshift
4
- tag : image-v7.4 .0
4
+ tag : image-v8.0 .0
Original file line number Diff line number Diff line change @@ -10,12 +10,18 @@ aliases:
10
10
- luis-falcon
11
11
- reedcort
12
12
srep-functional-team-fedramp:
13
- - tonytheleg
14
13
- theautoroboto
15
- - rhdedgar
16
14
- katherinelc321
17
15
- rojasreinold
18
16
- fsferraz-rh
17
+ - jonahbrawley
18
+ - digilink
19
+ - annelson-rh
20
+ - pheckenlWork
21
+ - ironcladlou
22
+ - MrSantamaria
23
+ - PeterCSRE
24
+ - cjnovak98
19
25
srep-functional-team-hulk:
20
26
- ravitri
21
27
- devppratik
@@ -41,6 +47,7 @@ aliases:
41
47
- aliceh
42
48
- anispate
43
49
- clcollins
50
+ - jimdaga
44
51
- Mhodesty
45
52
- nephomaniac
46
53
- tnierman
Original file line number Diff line number Diff line change 1
- image-v7.4 .0
1
+ image-v8.0 .0
Original file line number Diff line number Diff line change 1
- b655ba1347f9bd549afec9f383b5154ca4747c37
1
+ 3bad269ad200e258a0572566f6e5f08a88b2a8c4
Original file line number Diff line number Diff line change @@ -56,13 +56,7 @@ elif grep -q '^ M boilerplate/_data/last-boilerplate-commit$' $git_status; then
56
56
bp_compare_url=" https://github.com/openshift/boilerplate/compare/$bp_commit_change "
57
57
# Generate the commit history for this range. This will go in the commit message.
58
58
(
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} "
66
60
cd " ${bp_clone} "
67
61
# Matches promote.sh
68
62
git log --no-merges --pretty=format:' commit: %H%nauthor: %an%n%s%n%n%b%n%n' $bp_commit_change > $bp_log
Original file line number Diff line number Diff line change @@ -30,6 +30,8 @@ parameters:
30
30
required : true
31
31
- name : LOG_BUCKET
32
32
value : ' osde2e-logs'
33
+ - name : USE_EXISTING_CLUSTER
34
+ value : ' TRUE'
33
35
objects :
34
36
- apiVersion : batch/v1
35
37
kind : Job
@@ -77,4 +79,8 @@ objects:
77
79
- name : GCP_CREDS_JSON
78
80
value : ${GCP_CREDS_JSON}
79
81
- 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}
Original file line number Diff line number Diff line change @@ -21,9 +21,9 @@ OPERATOR_NAME_CAMEL_CASE=${OPERATOR_PROPER_NAME// /}
21
21
22
22
mkdir -p " ${E2E_SUITE_DIRECTORY} "
23
23
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
25
25
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 "
27
27
fi
28
28
29
29
echo " syncing ${E2E_SUITE_DIRECTORY} /Dockerfile"
@@ -109,4 +109,4 @@ sed -e "s/\${OPERATOR_NAME}/${OPERATOR_NAME}/" $(dirname $0)/e2e-template.yml >"
109
109
# todo: remove after file is renamed in ALL consumer repos
110
110
if [ -f " ${E2E_SUITE_DIRECTORY} /test-harness-template.yml" ]; then
111
111
rm -f " ${E2E_SUITE_DIRECTORY} /test-harness-template.yml"
112
- fi
112
+ fi
Original file line number Diff line number Diff line change @@ -10,12 +10,18 @@ aliases:
10
10
- luis-falcon
11
11
- reedcort
12
12
srep-functional-team-fedramp:
13
- - tonytheleg
14
13
- theautoroboto
15
- - rhdedgar
16
14
- katherinelc321
17
15
- rojasreinold
18
16
- fsferraz-rh
17
+ - jonahbrawley
18
+ - digilink
19
+ - annelson-rh
20
+ - pheckenlWork
21
+ - ironcladlou
22
+ - MrSantamaria
23
+ - PeterCSRE
24
+ - cjnovak98
19
25
srep-functional-team-hulk:
20
26
- ravitri
21
27
- devppratik
@@ -41,6 +47,7 @@ aliases:
41
47
- aliceh
42
48
- anispate
43
49
- clcollins
50
+ - jimdaga
44
51
- Mhodesty
45
52
- nephomaniac
46
53
- tnierman
Original file line number Diff line number Diff line change 109
109
fi
110
110
BP_CLONE=" $( mktemp -d) "
111
111
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
+
119
114
echo " Updating the update script."
120
115
rsync -a " ${BP_CLONE} /boilerplate/update" " $0 "
121
116
echo " Copying utilities"
Original file line number Diff line number Diff line change 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
2
2
3
3
ADD . /opt
4
4
WORKDIR /opt
You can’t perform that action at this time.
0 commit comments