Skip to content

OpenStack: fix binaries in test image #8065

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

Jump to bottom
Merged
openshift-merge-robot merged 1 commit into from
Jun 4, 2020
Merged

OpenStack: fix binaries in test image #8065

openshift-merge-robot merged 1 commit into from
Jun 4, 2020

Conversation

@mandre
Copy link
Member

@mandre mandre commented Apr 1, 2020

Newer $IMAGE_TESTS now have /usr/bin/openshift-tests and
/usr/bin/openshift-tests-kubernetes. We need to copy both of them.

Also /usr/bin/kubectl is a symlink pointing to /usr/bin/oc, so unless
the openstack image has the file exists on the OpenStack test image,
this won't work or won't point to the expected version of the binary.
This commit copies all the symlinks pointing to oc from the
$IMAGE_TESTS to their new location.

Additionally, copy binaries from $IMAGE_TESTS into a subdirectory in
/tmp/shared to prevent name collision since this directory is prepended
to the PATH and we create files such as exit that could shadow real
commands.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 1, 2020
@mandre
Copy link
Member Author

mandre commented Apr 1, 2020

/uncc patrickdillon jstuever
/cc pierreprinetti adduarte

@openshift-ci-robot openshift-ci-robot requested review from adduarte and pierreprinetti and removed request for jstuever and patrickdillon April 1, 2020 13:47
@mandre
Copy link
Member Author

mandre commented Apr 1, 2020

/test pj-rehearse

@mandre
Copy link
Member Author

mandre commented Apr 1, 2020

For future reference, the change in origin that broke us: openshift/origin#24560

@mandre
Copy link
Member Author

mandre commented Apr 2, 2020

/test pj-rehearse

1 similar comment
@pierreprinetti
Copy link
Member

pierreprinetti commented Apr 2, 2020

/test pj-rehearse

pierreprinetti
pierreprinetti reviewed Jun 4, 2020
View reviewed changes
ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml Outdated
Copy link
Member

@pierreprinetti pierreprinetti Jun 4, 2020

Choose a reason for hiding this comment

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

Please set -euo pipefail

@mandre mandre force-pushed the copy-test-binaries branch 2 times, most recently from 6c59492 to 05af7db Compare June 4, 2020 09:08
@pierreprinetti
Copy link
Member

pierreprinetti commented Jun 4, 2020

https://storage.googleapis.com/origin-ci-test/pr-logs/pull/openshift_release/8065/rehearse-8065-pull-ci-openshift-cloud-credential-operator-master-e2e-openstack/2/build-log.txt

"kubectl": executable file not found in $PATH

@mandre
Copy link
Member Author

mandre commented Jun 4, 2020

/test pj-rehearse

@mandre
Copy link
Member Author

mandre commented Jun 4, 2020

https://storage.googleapis.com/origin-ci-test/pr-logs/pull/openshift_release/8065/rehearse-8065-pull-ci-openshift-cloud-credential-operator-master-e2e-openstack/2/build-log.txt

"kubectl": executable file not found in $PATH

Hmm if you look at the timestamp of this job, it ran on April 1st. Something fishy is going on...

https://deck-ci.apps.ci.l2s4.p1.openshiftapps.com/view/gcs/origin-ci-test/pr-logs/pull/openshift_release/8065/rehearse-8065-pull-ci-openshift-cloud-credential-operator-master-e2e-openstack/2

@pierreprinetti
Copy link
Member

pierreprinetti commented Jun 4, 2020

/test pj-rehearse

3 similar comments
@pierreprinetti
Copy link
Member

pierreprinetti commented Jun 4, 2020

/test pj-rehearse

@mandre
Copy link
Member Author

mandre commented Jun 4, 2020

/test pj-rehearse

@droslean
Copy link
Member

droslean commented Jun 4, 2020

/test pj-rehearse

@mandre
OpenStack: fix binaries in test image
0769f01 
Newer $IMAGE_TESTS now have /usr/bin/openshift-tests and
/usr/bin/openshift-tests-kubernetes. We need to copy both of them.

Also /usr/bin/kubectl is a symlink pointing to /usr/bin/oc, so unless
the openstack image has the file exists on the OpenStack test image,
this won't work or won't point to the expected version of the binary.
This commit copies all the symlinks pointing to `oc` from the
$IMAGE_TESTS to their new location.

Additionally, copy binaries from $IMAGE_TESTS into a subdirectory in
/tmp/shared to prevent name collision since this directory is prepended
to the PATH and we create files such as `exit` that could shadow real
commands.
@mandre mandre force-pushed the copy-test-binaries branch from 05af7db to 0769f01 Compare June 4, 2020 12:58
@pierreprinetti
Copy link
Member

pierreprinetti commented Jun 4, 2020

/lgtm

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

openshift-ci-robot commented Jun 4, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mandre, pierreprinetti

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:

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 aa96315 into openshift:master Jun 4, 2020
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jun 4, 2020

@mandre: Updated the following 4 configmaps:

  • prow-job-cluster-launch-installer-openstack-e2e configmap in namespace ci at cluster api.ci using the following files:
    • key cluster-launch-installer-openstack-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml
  • prow-job-cluster-launch-installer-openstack-e2e configmap in namespace ci at cluster app.ci using the following files:
    • key cluster-launch-installer-openstack-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml
  • prow-job-cluster-launch-installer-openstack-e2e configmap in namespace ci at cluster build01 using the following files:
    • key cluster-launch-installer-openstack-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml
  • prow-job-cluster-launch-installer-openstack-e2e configmap in namespace ci at cluster build02 using the following files:
    • key cluster-launch-installer-openstack-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml
Details

In response to this:

Newer $IMAGE_TESTS now have /usr/bin/openshift-tests and
/usr/bin/openshift-tests-kubernetes. We need to copy both of them.

Also /usr/bin/kubectl is a symlink pointing to /usr/bin/oc, so unless
the openstack image has the file exists on the OpenStack test image,
this won't work or won't point to the expected version of the binary.
This commit copies all the symlinks pointing to oc from the
$IMAGE_TESTS to their new location.

Additionally, copy binaries from $IMAGE_TESTS into a subdirectory in
/tmp/shared to prevent name collision since this directory is prepended
to the PATH and we create files such as exit that could shadow real
commands.

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.

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

Reviewers

@adduarte adduarte Awaiting requested review from adduarte

1 more reviewer

@pierreprinetti pierreprinetti pierreprinetti left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@pierreprinetti pierreprinetti

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mandre @pierreprinetti @droslean @openshift-ci-robot @openshift-merge-robot