Skip to content

e2e: Prepare to support new openshift-tests binary in 4.0 jobs #2108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Nov 13, 2018
Merged

e2e: Prepare to support new openshift-tests binary in 4.0 jobs #2108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 56 additions & 0 deletions ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,62 @@ presubmits:
cpu: 10m
serviceAccountName: ci-operator
trigger: ((?m)^/test( all| images),?(\s+|$))
- agent: kubernetes
always_run: false
branches:
- master
context: ci/prow/launch-aws
decorate: true
name: pull-ci-openshift-installer-master-launch-aws
rerun_command: /test launch-aws
skip_cloning: true
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --give-pr-author-access-to-namespace=true
- --secret-dir=/usr/local/launch-aws-cluster-profile
- --target=launch-aws
- --template=/usr/local/launch-aws
command:
- ci-operator
env:
- name: CLUSTER_TYPE
value: aws
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: openshift-installer-master.yaml
name: ci-operator-configs
- name: JOB_NAME_SAFE
value: launch-aws
- name: TEST_COMMAND
value: sleep 6900
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
limits:
cpu: 500m
requests:
cpu: 10m
volumeMounts:
- mountPath: /usr/local/launch-aws-cluster-profile
name: cluster-profile
- mountPath: /usr/local/launch-aws
name: job-definition
subPath: cluster-launch-installer-e2e.yaml
serviceAccountName: ci-operator
volumes:
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-aws
- configMap:
name: prow-job-cluster-launch-installer-e2e
name: job-definition
trigger: ((?m)^/test( all| launch-aws),?(\s+|$))
- agent: kubernetes
always_run: true
branches:
Expand Down
12 changes: 9 additions & 3 deletions ci-operator/templates/cluster-launch-e2e-openshift-ansible.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,16 @@ objects:
oc create -f https://raw.githubusercontent.com/openshift/telemeter/master/deploy/telemeter-client-openshift.yaml -n openshift-telemetry
set -e

# TODO: the test binary should really be a more structured command - most of these flags should be
# autodetected from the running cluster.
# TODO: bump nodes up to 40 again
function run-tests() {
if which openshift-tests && [[ -n "${TEST_SUITE-}" ]]; then
openshift-tests run "${TEST_SUITE}" --provider "${TEST_PROVIDER:-}" -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit
exit 0
fi
# TODO: remove everything after this point once we fork templates by release - starting with 4.0
if ! which extended.test; then
echo "must provide TEST_SUITE variable"
exit 1
fi
if [[ -n "${TEST_FOCUS:-}" ]]; then
ginkgo -v -noColor -nodes="${TEST_PARALLELISM:-30}" $( which extended.test ) -- \
-ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP:-"\\[local\\]"}" \
Expand Down
11 changes: 9 additions & 2 deletions ci-operator/templates/cluster-launch-e2e-openshift-jenkins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,16 @@ objects:
oc create -f https://raw.githubusercontent.com/openshift/telemeter/master/deploy/telemeter-client-openshift.yaml -n openshift-telemetry
set -e

# TODO: the test binary should really be a more structured command - most of these flags should be
# autodetected from the running cluster.
function run-tests() {
if which openshift-tests && [[ -n "${TEST_SUITE-}" ]]; then
openshift-tests run "${TEST_SUITE}" --provider "${TEST_PROVIDER:-}" -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit
exit 0
fi
# TODO: remove everything after this point once we fork templates by release - starting with 4.0
if ! which extended.test; then
echo "must provide TEST_SUITE variable"
exit 1
fi
if [[ -n "${TEST_FOCUS:-}" ]]; then
ginkgo -v -noColor -nodes="${TEST_PARALLELISM:-30}" $( which extended.test ) -- \
-ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP:-"\\[local\\]"}" \
Expand Down
12 changes: 9 additions & 3 deletions ci-operator/templates/cluster-launch-e2e-upgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,16 @@ objects:
oc create -f https://raw.githubusercontent.com/openshift/telemeter/master/deploy/telemeter-client-openshift.yaml -n openshift-telemetry
set -e

# TODO: the test binary should really be a more structured command - most of these flags should be
# autodetected from the running cluster.
# TODO: bump nodes up to 40 again
function run-tests() {
if which openshift-tests && [[ -n "${TEST_SUITE-}" ]]; then
openshift-tests run "${TEST_SUITE}" --provider "${TEST_PROVIDER:-}" -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit
exit 0
fi
# TODO: remove everything after this point once we fork templates by release - starting with 4.0
if ! which extended.test; then
echo "must provide TEST_SUITE variable"
exit 1
fi
if [[ -n "${TEST_FOCUS:-}" ]]; then
ginkgo -v -noColor -nodes="${TEST_PARALLELISM:-30}" $( which extended.test ) -- \
-ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP:-"\\[local\\]"}" \
Expand Down
12 changes: 9 additions & 3 deletions ci-operator/templates/cluster-launch-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,16 @@ objects:
oc create -f https://raw.githubusercontent.com/openshift/telemeter/master/deploy/telemeter-client-openshift.yaml -n openshift-telemetry
set -e

# TODO: the test binary should really be a more structured command - most of these flags should be
# autodetected from the running cluster.
# TODO: bump nodes up to 40 again
function run-tests() {
if which openshift-tests && [[ -n "${TEST_SUITE-}" ]]; then
openshift-tests run "${TEST_SUITE}" --provider "${TEST_PROVIDER:-}" -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit
exit 0
fi
# TODO: remove everything after this point once we fork templates by release - starting with 4.0
if ! which extended.test; then
echo "must provide TEST_SUITE variable"
exit 1
fi
if [[ -n "${TEST_FOCUS:-}" ]]; then
ginkgo -v -noColor -nodes="${TEST_PARALLELISM:-30}" $( which extended.test ) -- \
-ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP:-"\\[local\\]"}" \
Expand Down
16 changes: 12 additions & 4 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,12 @@ objects:
mkdir -p ~/.ssh
cp /tmp/cluster/ssh-privatekey ~/.ssh/google_compute_engine || true
export PROVIDER_ARGS='-provider=gce -gce-zone=us-east1-c -gce-project=openshift-gce-devel-ci'
export TEST_PROVIDER='{"type":"gce","zone":"us-east1-c","projectid":"openshift-gce-devel-ci"}'
elif [[ "${CLUSTER_TYPE}" == "aws" ]]; then
export PROVIDER_ARGS="-provider=aws -gce-zone=us-east-1"
mkdir -p ~/.ssh
cp /tmp/cluster/ssh-privatekey ~/.ssh/kube_aws_rsa || true
export PROVIDER_ARGS="-provider=aws -gce-zone=us-east-1"
export TEST_PROVIDER='{"type":"aws","zone":"us-east-1"}'
elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then
mkdir -p ~/.ssh
cp /tmp/cluster/ssh-privatekey ~/.ssh/kube_openstack_rsa || true
Expand All @@ -190,10 +192,16 @@ objects:
oc create -f https://raw.githubusercontent.com/openshift/telemeter/master/deploy/telemeter-client-openshift.yaml -n openshift-telemetry
set -e

# TODO: the test binary should really be a more structured command - most of these flags should be
# autodetected from the running cluster.
# TODO: bump nodes up to 40 again
function run-tests() {
if which openshift-tests && [[ -n "${TEST_SUITE-}" ]]; then
openshift-tests run "${TEST_SUITE}" --provider "${TEST_PROVIDER:-}" -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit
exit 0
Copy link
Copy Markdown
Member

@wking wking Nov 12, 2018

Choose a reason for hiding this comment

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

Is this just while you're testing? Won't we want the function and script to return the openshift-tests exit status?

Copy link
Copy Markdown
Contributor Author

@smarterclayton smarterclayton Nov 12, 2018

Choose a reason for hiding this comment

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

it should already be set -e

Copy link
Copy Markdown
Member

@wking wking Nov 12, 2018

Choose a reason for hiding this comment

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

it should already be set -e

Oh, right. exit 0 is fine then, although I'd prefer a bare exit to avoid confusing folks like me who forget about the set -e ;).

Copy link
Copy Markdown
Contributor Author

@smarterclayton smarterclayton Nov 13, 2018

Choose a reason for hiding this comment

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

the rest of the function avoids bare exits to be clear. In the long run, this would simply be a call to Openshift-tests, but until we remove the other sections it's better to be consistent.

fi
# TODO: remove everything after this point once we fork templates by release - starting with 4.0
if ! which extended.test; then
echo "must provide TEST_SUITE variable"
exit 1
fi
if [[ -n "${TEST_FOCUS:-}" ]]; then
ginkgo -v -noColor -nodes="${TEST_PARALLELISM:-30}" $( which extended.test ) -- \
-ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP:-"\\[local\\]"}" \
Expand Down
9 changes: 9 additions & 0 deletions ci-operator/templates/openshift/openshift-azure/cluster-launch-e2e-azure-conformance.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,15 @@ objects:
# TODO: bump nodes up to 40 again
source /tmp/shared/overrides
function run-tests() {
if which openshift-tests && [[ -n "${TEST_SUITE-}" ]]; then
openshift-tests run "${TEST_SUITE}" --provider "${TEST_PROVIDER:-}" -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit
exit 0
fi
# TODO: remove everything after this point once we fork templates by release - starting with 4.0
if ! which extended.test; then
echo "must provide TEST_SUITE variable"
exit 1
fi
if [[ -n "${TEST_FOCUS:-}" ]]; then
ginkgo -v -noColor -nodes="${TEST_PARALLELISM:-30}" $( which extended.test ) -- \
-ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP:-"\\[local\\]"}" \
Expand Down