Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -218,3 +218,54 @@ periodics:
sources:
- secret:
name: cluster-secrets-azure-file
- agent: kubernetes
cron: ""
decorate: true
interval: 24h
name: azure-test-production-resource-provider
skip_cloning: true
spec:
containers:
- args:
- --secret-dir=/usr/local/e2e-secrets/azure
- --target=[output:stable:sync]
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not really needed; I will see whether we can get rid of it w/o needing any changes in the template in a follow-up.

- --target=e2e-azure
- --template=/usr/local/e2e-azure
command:
- ci-operator
env:
- name: CLUSTER_TYPE
value: azure
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: openshift-openshift-azure-master.yaml
name: ci-operator-configs
- name: JOB_NAME_SAFE
value: e2e-azure
- name: TEST_IN_PRODUCTION
value: "true"
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
limits:
cpu: 500m
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/e2e-secrets/azure
name: cluster-secrets-azure-file
- mountPath: /usr/local/e2e-azure
name: job-definition
subPath: cluster-launch-e2e-azure.yaml
serviceAccountName: ci-operator
volumes:
- name: cluster-secrets-azure-file
projected:
sources:
- secret:
name: cluster-secrets-azure-file
- configMap:
name: prow-job-cluster-launch-e2e-azure
name: job-definition
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ parameters:
- name: CLUSTER_TYPE
value: "azure"
required: true
- name: TEST_IN_PRODUCTION

objects:

Expand Down Expand Up @@ -74,6 +75,8 @@ objects:
env:
- name: HOME
value: /tmp/shared/home
- name: TEST_IN_PRODUCTION
value: ${TEST_IN_PRODUCTION}
command:
- /bin/bash
- -c
Expand All @@ -82,6 +85,12 @@ objects:
# error handling and sync code
set -euo pipefail

if [[ -n ${TEST_IN_PRODUCTION} ]]; then
# If we are testing in production then currently
# we don't have any _data locally to run openshift e2es.
exit 0
fi

trap 'touch /tmp/shared/exit' EXIT
trap 'kill $(jobs -p); exit 0' TERM

Expand Down Expand Up @@ -134,6 +143,8 @@ objects:
value: "true"
- name: RESOURCEGROUP_TTL
value: 4h
- name: TEST_IN_PRODUCTION
value: ${TEST_IN_PRODUCTION}
command:
- /bin/bash
- -c
Expand Down Expand Up @@ -184,12 +195,20 @@ objects:
value: ${CLUSTER_TYPE}
- name: HOME
value: /tmp/shared/home
- name: TEST_IN_PRODUCTION
value: ${TEST_IN_PRODUCTION}
command:
- /bin/bash
- -c
- |
#!/bin/bash

if [[ -n ${TEST_IN_PRODUCTION} ]]; then
# If we are testing in production then teardown
# happens as part of the e2e framework.
exit 0
fi

# teardown is collecting debug data and deleting all used resources
function teardown() {
set +e
Expand Down