Skip to content

Commit 7da445b

Browse files
committed
copying e2e suite update from boilerplate
1 parent 78e728c commit 7da445b

File tree

2 files changed

+70
-68
lines changed

2 files changed

+70
-68
lines changed

test/e2e/project.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ e2e-harness-build: GOFLAGS_MOD=-mod=mod
1818
e2e-harness-build: GOENV=GOOS=${GOOS} GOARCH=${GOARCH} CGO_ENABLED=0 GOFLAGS="${GOFLAGS_MOD}"
1919
e2e-harness-build:
2020
go mod tidy
21-
${GOENV} go test ./test/e2e -v -c --tags=osde2e -o harness.test
21+
go test ./test/e2e -v -c --tags=osde2e -o harness.test
2222

2323
# TODO: Push to a known image tag and commit id
2424
# push harness image

test/e2e/test-harness-template.yml

Lines changed: 69 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -3,71 +3,73 @@ kind: Template
33
metadata:
44
name: osde2e-focused-tests
55
parameters:
6-
- name: OSDE2E_CONFIGS
7-
required: true
8-
- name: TEST_HARNESS_IMAGE
9-
required: true
10-
- name: OCM_TOKEN
11-
required: true
12-
- name: OCM_CCS
13-
required: false
14-
- name: AWS_ACCESS_KEY_ID
15-
required: false
16-
- name: AWS_SECRET_ACCESS_KEY
17-
required: false
18-
- name: CLOUD_PROVIDER_REGION
19-
required: false
20-
- name: GCP_CREDS_JSON
21-
required: false
22-
- name: JOBID
23-
generate: expression
24-
from: "[0-9a-z]{7}"
25-
- name: IMAGE_TAG
26-
value: ''
27-
required: true
28-
- name: LOG_BUCKET
29-
value: 'osde2e-logs'
6+
- name: OSDE2E_CONFIGS
7+
required: true
8+
- name: TEST_HARNESS_IMAGE
9+
required: true
10+
- name: OCM_TOKEN
11+
required: true
12+
- name: OCM_CCS
13+
required: false
14+
- name: AWS_ACCESS_KEY_ID
15+
required: false
16+
- name: AWS_SECRET_ACCESS_KEY
17+
required: false
18+
- name: CLOUD_PROVIDER_REGION
19+
required: false
20+
- name: GCP_CREDS_JSON
21+
required: false
22+
- name: JOBID
23+
generate: expression
24+
from: "[0-9a-z]{7}"
25+
- name: IMAGE_TAG
26+
value: ''
27+
required: true
28+
- name: LOG_BUCKET
29+
value: 'osde2e-logs'
3030
objects:
31-
- apiVersion: batch/v1
32-
kind: Job
33-
metadata:
34-
name: validation-webhook-${IMAGE_TAG}-${JOBID}
35-
spec:
36-
backoffLimit: 0
37-
template:
38-
spec:
39-
restartPolicy: Never
40-
containers:
41-
- name: osde2e
42-
image: quay.io/redhat-services-prod/osde2e-cicada-tenant/osde2e:latest
43-
command:
44-
- /osde2e
45-
args:
46-
- test
47-
- --only-health-check-nodes
48-
- --configs
49-
- ${OSDE2E_CONFIGS}
50-
securityContext:
51-
runAsNonRoot: true
52-
allowPrivilegeEscalation: false
53-
capabilities:
54-
drop: ["ALL"]
55-
seccompProfile:
56-
type: RuntimeDefault
57-
env:
58-
- name: TEST_HARNESSES
59-
value: ${TEST_HARNESS_IMAGE}:${IMAGE_TAG}
60-
- name: OCM_TOKEN
61-
value: ${OCM_TOKEN}
62-
- name: OCM_CCS
63-
value: ${OCM_CCS}
64-
- name: AWS_ACCESS_KEY_ID
65-
value: ${AWS_ACCESS_KEY_ID}
66-
- name: AWS_SECRET_ACCESS_KEY
67-
value: ${AWS_SECRET_ACCESS_KEY}
68-
- name: CLOUD_PROVIDER_REGION
69-
value: ${CLOUD_PROVIDER_REGION}
70-
- name: GCP_CREDS_JSON
71-
value: ${GCP_CREDS_JSON}
72-
- name: LOG_BUCKET
73-
value: ${LOG_BUCKET}
31+
- apiVersion: batch/v1
32+
kind: Job
33+
metadata:
34+
name: validation-webhook-${IMAGE_TAG}-${JOBID}
35+
spec:
36+
backoffLimit: 0
37+
template:
38+
spec:
39+
restartPolicy: Never
40+
containers:
41+
- name: osde2e
42+
image: quay.io/redhat-services-prod/osde2e-cicada-tenant/osde2e:latest
43+
command:
44+
- /osde2e
45+
args:
46+
- test
47+
- --only-health-check-nodes
48+
- --skip-destroy-cluster
49+
- --skip-must-gather
50+
- --configs
51+
- ${OSDE2E_CONFIGS}
52+
securityContext:
53+
runAsNonRoot: true
54+
allowPrivilegeEscalation: false
55+
capabilities:
56+
drop: ["ALL"]
57+
seccompProfile:
58+
type: RuntimeDefault
59+
env:
60+
- name: TEST_HARNESSES
61+
value: ${TEST_HARNESS_IMAGE}:${IMAGE_TAG}
62+
- name: OCM_TOKEN
63+
value: ${OCM_TOKEN}
64+
- name: OCM_CCS
65+
value: ${OCM_CCS}
66+
- name: AWS_ACCESS_KEY_ID
67+
value: ${AWS_ACCESS_KEY_ID}
68+
- name: AWS_SECRET_ACCESS_KEY
69+
value: ${AWS_SECRET_ACCESS_KEY}
70+
- name: CLOUD_PROVIDER_REGION
71+
value: ${CLOUD_PROVIDER_REGION}
72+
- name: GCP_CREDS_JSON
73+
value: ${GCP_CREDS_JSON}
74+
- name: LOG_BUCKET
75+
value: ${LOG_BUCKET}

0 commit comments

Comments
 (0)