Skip to content

Commit 7fc9fd4

Browse files
committed
fix: image version.
Signed-off-by: Alexander Cristurean <[email protected]>
1 parent 6ab42e7 commit 7fc9fd4

File tree

3 files changed

+28
-13
lines changed

3 files changed

+28
-13
lines changed

pipelines/test/ocp/aws/pipeline.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
default: aro-pull-secret # Need to rename this to pull-secret
1515
- name: base-domain
1616
type: string
17-
default: "aws.kua.app-services-dev.net"
17+
default: "kuadrant-qe.hcpapps.net"
1818
- name: ssh-key
1919
type: string
2020
default: ssh-public-key
@@ -58,10 +58,6 @@ spec:
5858
description: Keycloak subscription channel
5959
name: keycloak-channel
6060
type: string
61-
- default: ""
62-
description: Extensions binary image
63-
name: extensions-binary-image
64-
type: string
6561
- default: ""
6662
description: Additional flags for helm install command, example '--set=kuadrant.installPlanApproval=Manual --set=kuadrant.startingCSV=kuadrant-operator.v1.2.0'
6763
name: additional-helm-flags
@@ -166,8 +162,6 @@ spec:
166162
value: $(params.gateway-crd)
167163
- name: keycloak-channel
168164
value: $(params.keycloak-channel)
169-
- name: extensions-binary-image
170-
value: $(params.extensions-binary-image)
171165
- name: additional-helm-flags
172166
value: $(params.additional-helm-flags)
173167
- name: additional-helm-tools-flags

tasks/infra/delete-ocp-aws.yaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ spec:
4141
secretKeyRef:
4242
key: AWS_SECRET_ACCESS_KEY
4343
name: $(params.aws-credentials)
44+
- name: CLUSTER_MANAGEMENT_CI_TOKEN
45+
valueFrom:
46+
secretKeyRef:
47+
key: CLUSTER_MANAGEMENT_CI_TOKEN
48+
name: cluster-management-ci-token
4449
image: quay.io/acristur/osia:latest
4550
imagePullPolicy: Always
4651
name: delete-aws-ocp
@@ -54,6 +59,12 @@ spec:
5459
- -c
5560
- |
5661
set -euo pipefail
62+
63+
# Prepare git repository
64+
git -c http.sslVerify=false clone \
65+
"https://ci_robot_account:[email protected]/kuadrant-qe/cluster-management.git"
66+
git config --global user.email [email protected]
67+
git config --global user.name "CI Robot"
5768
5869
# Create AWS credentials file
5970
mkdir -p ~/.aws
@@ -65,8 +76,7 @@ spec:
6576
6677
6778
# Run osia clean
68-
osia clean \
69-
--cluster-name $(params.cluster-name) \
70-
--skip-git
79+
cd cluster-management
80+
osia clean --cluster-name $(params.cluster-name)
7181
7282

tasks/infra/provision-ocp-aws.yaml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,12 @@ spec:
8181
valueFrom:
8282
fieldRef:
8383
fieldPath: metadata.namespace
84-
image: quay.io/kuadrant/testsuite-pipelines-tools:dev
84+
- name: CLUSTER_MANAGEMENT_CI_TOKEN
85+
valueFrom:
86+
secretKeyRef:
87+
key: CLUSTER_MANAGEMENT_CI_TOKEN
88+
name: cluster-management-ci-token
89+
image: quay.io/kuadrant/testsuite-pipelines-tools:latest
8590
imagePullPolicy: Always
8691
name: provision-aws-ocp
8792
volumeMounts:
@@ -100,6 +105,12 @@ spec:
100105
- -c
101106
- |
102107
set -euo pipefail
108+
109+
# Prepare git repository
110+
git -c http.sslVerify=false clone \
111+
"https://ci_robot_account:[email protected]/kuadrant-qe/cluster-management.git"
112+
git config --global user.email [email protected]
113+
git config --global user.name "CI Robot"
103114
104115
# Create AWS credentials file
105116
mkdir -p ~/.aws
@@ -113,6 +124,7 @@ spec:
113124
mkdir -p ~/installers
114125
115126
# Run osia install
127+
cd cluster-management
116128
osia install \
117129
--cluster-name $(params.cluster-name) \
118130
--cloud aws \
@@ -127,8 +139,7 @@ spec:
127139
--credentials-file ~/.aws/credentials \
128140
--dns-provider route53 \
129141
--dns-credentials-file ~/.aws/credentials \
130-
--installer-arch arm64 \
131-
--skip-git
142+
--installer-arch arm64
132143
133144
# Get cluster credentials
134145
export username=$(grep "Login to the console with user:" $(params.cluster-name)/.openshift_install.log | sed 's/.*user: \\"\([^"]*\)\\".*/\1/')

0 commit comments

Comments
 (0)