Skip to content

osa- skip-tests determinize-prow-jobs jobs invalidates skip regexp #1520

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 2 commits into from
Sep 17, 2018
Merged

osa- skip-tests determinize-prow-jobs jobs invalidates skip regexp #1520

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bc9756
determinize-prow-jobs jobs invalidates skip regexp...
mjudeikis Sep 16, 2018
8297976
escape and remove cloud args
mjudeikis Sep 17, 2018
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
14 changes: 1 addition & 13 deletions ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,19 +206,7 @@ presubmits:
- name: TEST_FOCUS_SERIAL
value: Suite:openshift/conformance/serial/minimal
- name: TEST_SKIP
value: .*((The HAProxy router should set Forwarded headers appropriately)|(oc
new-app should succeed with a --name of 58 characters)|(process valueFrom
in build strategy environment variables should successfully resolve valueFrom
in docker build environment variables)|(prune builds based on settings
in the buildconfig should prune failed builds based on the failedBuildsHistoryLimit
setting)|(Prometheus when installed to the cluster should start and expose
a secured proxy and unsecured metrics)|(Prometheus when installed to the
cluster should start and expose a secured proxy and verify build metrics)|(templateservicebroker)|(deploymentconfigs
with multiple image change triggers [Conformance] should run a successful
deployment with multiple triggers)|(templateinstance readiness test should
report failed soon after an annotated objects has failed)|(s2i build with
a root user image should create a root build and pass with a privileged
SCC)).*
value: .*((The HAProxy router should set Forwarded headers appropriately)|(oc new-app should succeed with a --name of 58 characters)|(process valueFrom in build strategy environment variables should successfully resolve valueFrom in docker build environment variables)|(prune builds based on settings in the buildconfig should prune failed builds based on the failedBuildsHistoryLimit setting)|(Prometheus when installed to the cluster should start and expose a secured proxy and unsecured metrics)|(Prometheus when installed to the cluster should start and expose a secured proxy and verify build metrics)|(templateservicebroker)|(deploymentconfigs with multiple image change triggers [Conformance] should run a successful deployment with multiple triggers)|(templateinstance readiness test should report failed soon after an annotated objects has failed)|(s2i build with a root user image should create a root build and pass with a privileged SCC)).*
Copy link
Member

@wking wking Sep 16, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

I struggled with getting either sane wrapping or no wrapping through CI, and ended up giving up. You unwrapped line here is hitting that same issue.

- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
Expand Down
14 changes: 8 additions & 6 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 @@ -17,9 +17,11 @@ parameters:
- name: CLUSTER_TYPE
value: "azure"
required: true
- name: TEST_SUITE
Copy link
Member

@wking wking Sep 16, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Why are you adding the TEST_SUITE* back? They were intentionally removed in #1261.

Copy link
Contributor Author

@mjudeikis mjudeikis Sep 16, 2018

Choose a reason for hiding this comment

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

I was not aware of this.

Copy link
Contributor Author

@mjudeikis mjudeikis Sep 17, 2018

Choose a reason for hiding this comment

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

done

- name: TEST_FOCUS
- name: TEST_SKIP
value: "\\[local\\]"
- name: TEST_SUITE_SERIAL
- name: TEST_FOCUS_SERIAL
- name: TEST_SKIP_SERIAL
value: "\\[local\\]"
Expand Down Expand Up @@ -122,17 +124,17 @@ objects:
# TODO: bump nodes up to 40 again
source /tmp/shared/overrides
set -x
if [[ -n "${TEST_FOCUS}" ]]; then
if [[ -n "${TEST_SUITE}" || -n "${TEST_FOCUS}" ]]; then
ginkgo -v -noColor -nodes=30 $( which extended.test ) -- \
-ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \
-suite "${TEST_SUITE}" -ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit \
-test.timeout=2h || rc=$?
-test.timeout=2h ${PROVIDER_ARGS-} || rc=$?
Copy link
Member

@wking wking Sep 16, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Why PROVIDER_ARGS? If you want to consume it, you should probably set it. For example:

$ git grep PROVIDER_ARGS ci-operator/templates/cluster-launch-installer-e2e.yaml
ci-operator/templates/cluster-launch-installer-e2e.yaml:          export PROVIDER_ARGS='-provider
gce -gce-zone=us-east1-c -gce-project=openshift-gce-devel-ci'
ci-operator/templates/cluster-launch-installer-e2e.yaml:          export PROVIDER_ARGS="-provider
aws -gce-zone=${region}"
ci-operator/templates/cluster-launch-installer-e2e.yaml:            -test.timeout=10m ${PROVIDER_
RGS-} || rc=$?
ci-operator/templates/cluster-launch-installer-e2e.yaml:            -test.timeout=20m ${PROVIDER_
RGS-} || rc=$?

But if you don't have providers to distinguish between, it seems simpler to just remove PROVIDER_ARGS entirely.

Copy link
Contributor Author

@mjudeikis mjudeikis Sep 16, 2018

Choose a reason for hiding this comment

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

Azure dont use it, so we remove it so not to confuse

Copy link
Member

@wking wking Sep 16, 2018

Choose a reason for hiding this comment

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

Azure dont use it, so we remove it so not to confuse

So remove your addition here?

Copy link
Contributor Author

@mjudeikis mjudeikis Sep 17, 2018

Choose a reason for hiding this comment

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

done

fi
if [[ -n "${TEST_FOCUS_SERIAL}" ]]; then
if [[ -n "${TEST_SUITE_SERIAL}" || -n "${TEST_FOCUS_SERIAL}" ]]; then
ginkgo -v -noColor -nodes=1 $( which extended.test ) -- \
-ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \
-suite "${TEST_SUITE_SERIAL}" -ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit/serial \
-test.timeout=2h || rc=$?
-test.timeout=2h ${PROVIDER_ARGS-} || rc=$?
fi
exit ${rc:-0}

Expand Down