Skip to content

Conversation

@bbguimaraes
Copy link
Contributor

Resurrecting #1527.

/assign @smarterclayton @stevekuznetsov

@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. sig/azure Categorizes item related to Azure jobs labels Oct 3, 2018
Copy link
Contributor

@stevekuznetsov stevekuznetsov left a comment

Choose a reason for hiding this comment

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

I think we need the $TEST_COMMAND as a parameter env, as well as a container env, and pass it through three (?) times to get it to work?

@smarterclayton woo! template ux ++

- name: TEST_SKIP
value: (\\[local\\]|\\[templates\\]|\\[Feature:Router\\]|Kubectl logs)
- name: TEST_COMMAND
value: TEST_FOCUS=Suite:openshift/conformance/parallel/minimal TEST_SKIP='(\\[local\\]|\\[templates\\]|\\[Feature:Router\\]|Kubectl
Copy link
Contributor

Choose a reason for hiding this comment

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

This has double escapes whereas the others have single? Is it a bug in the focus?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

  1. What format does ginkgo expect?
  2. There is no semantic change here.
  3. If it worked before, it will still work. If it didn't, it won't.
  4. /shrug?

Copy link
Contributor

Choose a reason for hiding this comment

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

yeah agreed on all counts

Copy link
Contributor

Choose a reason for hiding this comment

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

I think \\[ is correct -- we want a literal \[ going to the Ginkgo regex, so whoever is using \[ is wrong.

Copy link
Contributor

Choose a reason for hiding this comment

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

(out of band from this PR)

env:
- name: HOME
value: /tmp/home
- name: TEST_COMMAND
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't we still want this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

AFAICT, the only reason for having it as an environment variable before was for this test (repeated in a few templates), which would be problematic if it were done by template substitution because of quotes:

# create the environment, but exit before we run tests
if [[ -n "${TEST_COMMAND-}" ]]; then
${TEST_COMMAND}
exit 0
fi

We don't perform that test anymore, so that's not necessary. The only place that variable appears in the templates now is here:

https://github.com/openshift/release/pull/1799/files#diff-57ef18037f2eac7815d8357fe42f0a30R160

That's a template substitution, the variable will be replaced by whatever value it has in the pod spec and quotes etc. will be preserved. I tested the instantiation with oc process with a few problematic values and they all worked correctly.

@stevekuznetsov
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 4, 2018
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bbguimaraes, stevekuznetsov

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [bbguimaraes,stevekuznetsov]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 1f63e4e into openshift:master Oct 4, 2018
@openshift-ci-robot
Copy link
Contributor

@bbguimaraes: Updated the following 9 configmaps:

  • prow-job-cluster-launch-e2e-gmontero-testing configmap using the following files:
    • key cluster-launch-e2e-gmontero-testing.yaml using file ci-operator/templates/cluster-launch-e2e-gmontero-testing.yaml
  • job-config configmap using the following files:
    • key openshift-builder-master-presubmits.yaml using file ci-operator/jobs/openshift/builder/openshift-builder-master-presubmits.yaml
    • key openshift-image-registry-release-3.10-presubmits.yaml using file ci-operator/jobs/openshift/image-registry/openshift-image-registry-release-3.10-presubmits.yaml
    • key openshift-installer-master-presubmits.yaml using file ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
    • key openshift-jenkins-openshift-3.10-presubmits.yaml using file ci-operator/jobs/openshift/jenkins/openshift-jenkins-openshift-3.10-presubmits.yaml
    • key openshift-openshift-ansible-master-presubmits.yaml using file ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-master-presubmits.yaml
    • key openshift-openshift-azure-master-presubmits.yaml using file ci-operator/jobs/openshift/openshift-azure/openshift-openshift-azure-master-presubmits.yaml
    • key openshift-release-periodics.yaml using file ci-operator/jobs/openshift/release/openshift-release-periodics.yaml
    • key openshift-jenkins-openshift-3.11-presubmits.yaml using file ci-operator/jobs/openshift/jenkins/openshift-jenkins-openshift-3.11-presubmits.yaml
    • key openshift-origin-web-console-server-release-3.10-presubmits.yaml using file ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-release-3.10-presubmits.yaml
    • key openshift-openshift-ansible-release-3.11-presubmits.yaml using file ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-3.11-presubmits.yaml
    • key openshift-image-registry-master-presubmits.yaml using file ci-operator/jobs/openshift/image-registry/openshift-image-registry-master-presubmits.yaml
    • key openshift-image-registry-release-3.11-presubmits.yaml using file ci-operator/jobs/openshift/image-registry/openshift-image-registry-release-3.11-presubmits.yaml
    • key openshift-jenkins-master-presubmits.yaml using file ci-operator/jobs/openshift/jenkins/openshift-jenkins-master-presubmits.yaml
    • key openshift-openshift-ansible-release-3.10-presubmits.yaml using file ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-3.10-presubmits.yaml
    • key openshift-origin-web-console-server-master-presubmits.yaml using file ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-master-presubmits.yaml
    • key openshift-origin-web-console-server-release-3.11-presubmits.yaml using file ci-operator/jobs/openshift/origin-web-console-server/openshift-origin-web-console-server-release-3.11-presubmits.yaml
    • key openshift-origin-master-presubmits.yaml using file ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml
    • key openshift-origin-release-3.11-presubmits.yaml using file ci-operator/jobs/openshift/origin/openshift-origin-release-3.11-presubmits.yaml
  • prow-job-cluster-launch-e2e-upgrade configmap using the following files:
    • key cluster-launch-e2e-upgrade.yaml using file ci-operator/templates/cluster-launch-e2e-upgrade.yaml
  • prow-job-cluster-launch-e2e configmap using the following files:
    • key cluster-launch-e2e.yaml using file ci-operator/templates/cluster-launch-e2e.yaml
  • prow-job-cluster-launch-src configmap using the following files:
    • key cluster-launch-src.yaml using file ci-operator/templates/cluster-launch-src.yaml
  • prow-job-cluster-launch-installer-e2e configmap using the following files:
    • key cluster-launch-installer-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
  • prow-job-cluster-launch-e2e-azure-conformance configmap using the following files:
    • key cluster-launch-e2e-azure-conformance.yaml using file ci-operator/templates/openshift/openshift-azure/cluster-launch-e2e-azure-conformance.yaml
  • prow-job-cluster-launch-e2e-azure configmap using the following files:
    • key cluster-launch-e2e-azure.yaml using file ci-operator/templates/openshift/openshift-azure/cluster-launch-e2e-azure.yaml
  • prow-job-cluster-launch-e2e-openshift-ansible configmap using the following files:
    • key cluster-launch-e2e-openshift-ansible.yaml using file ci-operator/templates/cluster-launch-e2e-openshift-ansible.yaml
Details

In response to this:

Resurrecting #1527.

/assign @smarterclayton @stevekuznetsov

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@bbguimaraes bbguimaraes deleted the ginkgo branch October 4, 2018 08:03
-test.timeout=20m ${PROVIDER_ARGS-} || rc=$?
fi
exit ${rc:-0}
function run-tests() {
Copy link
Contributor

Choose a reason for hiding this comment

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

We lost path here which broke installer. I'll open a PR

Copy link
Member

Choose a reason for hiding this comment

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

We lost path here which broke installer. I'll open a PR

#1814

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm going to clean up the inconsistency and restore the fix in #1814

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. sig/azure Categorizes item related to Azure jobs size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants