Skip to content

Commit 2171623

Browse files
[tls-scanner] Provision 4.22 cluster for default-tls test step
1 parent 42cf30b commit 2171623

4 files changed

Lines changed: 18 additions & 18 deletions

File tree

ci-operator/config/openshift/cluster-api-provider-metal3/openshift-cluster-api-provider-metal3-main.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ tests:
5757
commands: make -C openshift verify
5858
container:
5959
from: src
60-
- as: e2e-metal3-capi-techpreview
60+
- always_run: false
61+
as: e2e-metal3-capi-techpreview
6162
capabilities:
6263
- intranet
6364
steps:

ci-operator/config/openshift/tls-scanner/openshift-tls-scanner-main.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,12 @@ resources:
3939
memory: 200Mi
4040
tests:
4141
- as: default-tls
42-
cluster_claim:
43-
architecture: amd64
44-
cloud: aws
45-
owner: openshift-ci
46-
product: ocp
47-
timeout: 5h0m0s
48-
version: "4.22"
4942
optional: true
5043
steps:
44+
cluster_profile: aws
5145
test:
5246
- ref: tls-scanner-run
53-
workflow: generic-claim
47+
workflow: ipi-aws
5448
- as: tls13-conformance
5549
optional: true
5650
steps:

ci-operator/jobs/openshift/cluster-api-provider-metal3/openshift-cluster-api-provider-metal3-main-presubmits.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
presubmits:
22
openshift/cluster-api-provider-metal3:
33
- agent: kubernetes
4-
always_run: true
4+
always_run: false
55
branches:
66
- ^main$
77
- ^main-
@@ -80,7 +80,7 @@ presubmits:
8080
- name: result-aggregator
8181
secret:
8282
secretName: result-aggregator
83-
trigger: (?m)^/test( | .* )e2e-metal3-capi-techpreview,?($|\s.*)
83+
trigger: (?m)^/test( | .* )(e2e-metal3-capi-techpreview|remaining-required),?($|\s.*)
8484
- agent: kubernetes
8585
always_run: true
8686
branches:

ci-operator/jobs/openshift/tls-scanner/openshift-tls-scanner-main-presubmits.yaml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ presubmits:
1111
decoration_config:
1212
skip_cloning: true
1313
labels:
14+
ci-operator.openshift.io/cloud: aws
15+
ci-operator.openshift.io/cloud-cluster-profile: aws
1416
ci.openshift.io/generator: prowgen
1517
pj-rehearse.openshift.io/can-be-rehearsed: "true"
1618
name: pull-ci-openshift-tls-scanner-main-default-tls
@@ -20,8 +22,8 @@ presubmits:
2022
containers:
2123
- args:
2224
- --gcs-upload-secret=/secrets/gcs/service-account.json
23-
- --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig
2425
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
26+
- --lease-server-credentials-file=/etc/boskos/credentials
2527
- --report-credentials-file=/etc/report/credentials
2628
- --secret-dir=/secrets/ci-pull-credentials
2729
- --target=default-tls
@@ -42,15 +44,15 @@ presubmits:
4244
requests:
4345
cpu: 10m
4446
volumeMounts:
47+
- mountPath: /etc/boskos
48+
name: boskos
49+
readOnly: true
4550
- mountPath: /secrets/ci-pull-credentials
4651
name: ci-pull-credentials
4752
readOnly: true
4853
- mountPath: /secrets/gcs
4954
name: gcs-credentials
5055
readOnly: true
51-
- mountPath: /secrets/hive-hive-credentials
52-
name: hive-hive-credentials
53-
readOnly: true
5456
- mountPath: /secrets/manifest-tool
5557
name: manifest-tool-local-pusher
5658
readOnly: true
@@ -62,12 +64,15 @@ presubmits:
6264
readOnly: true
6365
serviceAccountName: ci-operator
6466
volumes:
67+
- name: boskos
68+
secret:
69+
items:
70+
- key: credentials
71+
path: credentials
72+
secretName: boskos-credentials
6573
- name: ci-pull-credentials
6674
secret:
6775
secretName: ci-pull-credentials
68-
- name: hive-hive-credentials
69-
secret:
70-
secretName: hive-hive-credentials
7176
- name: manifest-tool-local-pusher
7277
secret:
7378
secretName: manifest-tool-local-pusher

0 commit comments

Comments
 (0)