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

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

OpenStack: fix binaries in test image #8065

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
19 changes: 13 additions & 6 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,18 @@ objects:
- name: shared-tmp
mountPath: /tmp/shared
command:
- cp
- /usr/bin/openshift-tests
- /usr/bin/oc
- /usr/bin/kubectl
- /tmp/shared/
- /bin/bash
- -c
- |
#!/bin/bash
set -euo pipefail

mkdir /tmp/shared/bin
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

cp /usr/bin/openshift-tests* /usr/bin/oc /tmp/shared/bin
for cmd in kubectl openshift-deploy openshift-docker-build openshift-extract-image-content openshift-git-clone openshift-manage-dockerfile openshift-recycle openshift-sti-build; do
ln -s /tmp/shared/bin/oc /tmp/shared/bin/$cmd
done

containers:
# NOTE openshift-tests requires access to openstackclient/cinder
# so we re-use the install image here which already contains
Expand Down Expand Up @@ -140,7 +147,7 @@ objects:
#!/bin/bash
set -euo pipefail

export PATH=/tmp/shared:/usr/libexec/origin:$PATH
export PATH=/tmp/shared/bin:/usr/libexec/origin:$PATH

trap 'touch /tmp/shared/exit' EXIT
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
Expand Down