Skip to content

Commit 1aed384

Browse files
spike(ACS): can we set the OCP version in ROSA HCP? (#68831)
* spike: can we set the OCP version in ROSA HCP? * add rosa image * change acs-fleet-manager OCP_VERSION to 4.17.38 * set default to latest available version of OCP (in ROSA) --------- Co-authored-by: Johannes Malsam <[email protected]>
1 parent 6f0aa7c commit 1aed384

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

ci-operator/config/stackrox/acs-fleet-manager/stackrox-acs-fleet-manager-main.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ base_images:
77
name: release
88
namespace: openshift
99
tag: golang-1.23
10+
rosa-hcp:
11+
name: automation-flavors
12+
namespace: stackrox
13+
tag: rosa-stable
1014
build_root:
1115
image_stream_tag:
1216
name: release
@@ -48,7 +52,7 @@ tests:
4852
- as: e2e
4953
steps:
5054
env:
51-
OCP_VERSION: ocp/fast-4.17
55+
OCP_VERSION: 4.17.38
5256
test:
5357
- ref: ipi-install-rbac
5458
- as: test
@@ -73,7 +77,7 @@ tests:
7377
requests:
7478
cpu: 2000m
7579
memory: 6000Mi
76-
workflow: stackrox-automation-flavors-ocp-4-e2e
80+
workflow: stackrox-automation-flavors-rosa-hcp-e2e
7781
zz_generated_metadata:
7882
branch: main
7983
org: stackrox

ci-operator/step-registry/stackrox/automation-flavors/rosa-hcp-e2e/stackrox-automation-flavors-rosa-hcp-e2e-workflow.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,16 @@ workflow:
88
export MANAGED_CP=true
99
export NODE_COUNT=2
1010
export WAIT_FOR_NODES_TRIES=30
11+
export ROSA_ARGS="--version=${OCP_VERSION}"
1112
/usr/bin/openshift-ci.sh create rosa
1213
credentials:
1314
- mount_path: /tmp/vault/stackrox-automation-flavors
1415
name: stackrox-automation-flavors
1516
namespace: test-credentials
17+
env:
18+
# By default, this is set to the latest available version of OCP
19+
- name: OCP_VERSION
20+
default: ''
1621
from: rosa-hcp
1722
resources:
1823
requests:

0 commit comments

Comments
 (0)