From 6ead9f62062de89fecccfa7e84cc5866763dc145 Mon Sep 17 00:00:00 2001 From: Pablo Acevedo Montserrat Date: Thu, 15 Jun 2023 18:12:01 +0200 Subject: [PATCH 1/3] ushift: Remove test-payload image and build within ec2 host Remove all references to microshift-test-payload image and take advantage of the ec2 host where microshift is installed. Use it to build the rpms and save some time from the image builder in the build cluster. Doing this change also changed all the base images for the rpm based tests and their dependencies. --- .../microshift/openshift-microshift-main.yaml | 34 ------------ ...shift-e2e-microshift-tests-aws-commands.sh | 4 +- ...croshift-e2e-microshift-tests-aws-ref.yaml | 2 +- ...openshift-conformance-reduced-aws-ref.yaml | 3 +- ...ift-microshift-infra-aws-ec2-logs-ref.yaml | 2 +- .../openshift-microshift-infra-pcp-ref.yaml | 2 +- ...openshift-microshift-infra-pmlogs-ref.yaml | 2 +- ...croshift-infra-rpm-install-aws-commands.sh | 53 ++++++++----------- ...-microshift-infra-rpm-install-aws-ref.yaml | 2 +- ...-infra-wait-for-cluster-up-aws-commands.sh | 1 - ...ift-infra-wait-for-cluster-up-aws-ref.yaml | 3 +- 11 files changed, 33 insertions(+), 75 deletions(-) diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index 7a94a672dadef..bcbec77a0c4da 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -35,42 +35,8 @@ images: as: - src to: rebase-payload -- dockerfile_literal: | - FROM src as rpms - RUN dnf install --setopt=tsflags=nodocs -y selinux-policy-devel - # Disable cgo when cross-compiling because it is not supported. - RUN make rpm && TARGET_ARCH=aarch64 CGO_ENABLED=0 make rpm - RUN tar cvf /rpms.tar -C _output/rpmbuild/RPMS/ . - - FROM test-runtime - - COPY oc openshift-tests /usr/bin/ - RUN ln -rs /usr/bin/oc /usr/bin/kubectl - - COPY microshift /microshift - COPY --from=rpms /rpms.tar /rpms.tar - inputs: - cli: - paths: - - destination_dir: . - source_path: /usr/bin/oc - src: - as: - - src - paths: - - destination_dir: . - source_path: /go/src/github.com/openshift/microshift - test-bin: - paths: - - destination_dir: . - source_path: /usr/bin/openshift-tests - test-runtime: - as: - - test-runtime - to: microshift-test-payload promotion: excluded_images: - - microshift-test-payload - rebase-payload name: "4.14" namespace: ocp diff --git a/ci-operator/step-registry/openshift/microshift/e2e/microshift-tests-aws/openshift-microshift-e2e-microshift-tests-aws-commands.sh b/ci-operator/step-registry/openshift/microshift/e2e/microshift-tests-aws/openshift-microshift-e2e-microshift-tests-aws-commands.sh index 15f5c0e65ab13..0979dc9efeff6 100644 --- a/ci-operator/step-registry/openshift/microshift/e2e/microshift-tests-aws/openshift-microshift-e2e-microshift-tests-aws-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/e2e/microshift-tests-aws/openshift-microshift-e2e-microshift-tests-aws-commands.sh @@ -27,7 +27,7 @@ USHIFT_USER: ${HOST_USER} SSH_PRIV_KEY: ${CLUSTER_PROFILE_DIR}/ssh-privatekey SSH_PORT: 22 EOF -/microshift/test/run.sh -o ${ARTIFACT_DIR} -i /tmp/variables.yaml -v /tmp/venv +/go/src/github.com/openshift/microshift/test/run.sh -o ${ARTIFACT_DIR} -i /tmp/variables.yaml -v /tmp/venv # Bash e2e tests firewall::open_port() { @@ -41,4 +41,4 @@ firewall::close_port() { export -f firewall::open_port export -f firewall::close_port -USHIFT_IP="${IP_ADDRESS}" USHIFT_USER="${HOST_USER}" /microshift/e2e/main.sh run +USHIFT_IP="${IP_ADDRESS}" USHIFT_USER="${HOST_USER}" /go/src/github.com/openshift/microshift/e2e/main.sh run diff --git a/ci-operator/step-registry/openshift/microshift/e2e/microshift-tests-aws/openshift-microshift-e2e-microshift-tests-aws-ref.yaml b/ci-operator/step-registry/openshift/microshift/e2e/microshift-tests-aws/openshift-microshift-e2e-microshift-tests-aws-ref.yaml index 77247a79c47f4..972c54e7e9810 100644 --- a/ci-operator/step-registry/openshift/microshift/e2e/microshift-tests-aws/openshift-microshift-e2e-microshift-tests-aws-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/e2e/microshift-tests-aws/openshift-microshift-e2e-microshift-tests-aws-ref.yaml @@ -1,7 +1,7 @@ ref: as: openshift-microshift-e2e-microshift-tests-aws cli: latest - from: microshift-test-payload + from: src commands: openshift-microshift-e2e-microshift-tests-aws-commands.sh resources: requests: diff --git a/ci-operator/step-registry/openshift/microshift/e2e/openshift-conformance-reduced-aws/openshift-microshift-e2e-openshift-conformance-reduced-aws-ref.yaml b/ci-operator/step-registry/openshift/microshift/e2e/openshift-conformance-reduced-aws/openshift-microshift-e2e-openshift-conformance-reduced-aws-ref.yaml index a65ce51629b43..f4b14a5f537e5 100644 --- a/ci-operator/step-registry/openshift/microshift/e2e/openshift-conformance-reduced-aws/openshift-microshift-e2e-openshift-conformance-reduced-aws-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/e2e/openshift-conformance-reduced-aws/openshift-microshift-e2e-openshift-conformance-reduced-aws-ref.yaml @@ -1,6 +1,7 @@ ref: as: openshift-microshift-e2e-openshift-conformance-reduced-aws - from: microshift-test-payload + cli: latest + from: test-bin commands: openshift-microshift-e2e-openshift-conformance-reduced-aws-commands.sh resources: requests: diff --git a/ci-operator/step-registry/openshift/microshift/infra/aws/ec2/logs/openshift-microshift-infra-aws-ec2-logs-ref.yaml b/ci-operator/step-registry/openshift/microshift/infra/aws/ec2/logs/openshift-microshift-infra-aws-ec2-logs-ref.yaml index ef2fed5371f6b..d743da39bdc34 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/aws/ec2/logs/openshift-microshift-infra-aws-ec2-logs-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/infra/aws/ec2/logs/openshift-microshift-infra-aws-ec2-logs-ref.yaml @@ -1,6 +1,6 @@ ref: as: openshift-microshift-infra-aws-ec2-logs - from: microshift-test-payload + from: test-runtime grace_period: 10m commands: openshift-microshift-infra-aws-ec2-logs-commands.sh resources: diff --git a/ci-operator/step-registry/openshift/microshift/infra/pcp/openshift-microshift-infra-pcp-ref.yaml b/ci-operator/step-registry/openshift/microshift/infra/pcp/openshift-microshift-infra-pcp-ref.yaml index d17fa8cd90ca7..e72bf88cab190 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/pcp/openshift-microshift-infra-pcp-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/infra/pcp/openshift-microshift-infra-pcp-ref.yaml @@ -1,7 +1,7 @@ ref: as: openshift-microshift-infra-pcp cli: latest - from: microshift-test-payload + from: test-runtime commands: openshift-microshift-infra-pcp-commands.sh resources: requests: diff --git a/ci-operator/step-registry/openshift/microshift/infra/pmlogs/openshift-microshift-infra-pmlogs-ref.yaml b/ci-operator/step-registry/openshift/microshift/infra/pmlogs/openshift-microshift-infra-pmlogs-ref.yaml index cf584ff966e7f..41ecf49fd14df 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/pmlogs/openshift-microshift-infra-pmlogs-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/infra/pmlogs/openshift-microshift-infra-pmlogs-ref.yaml @@ -1,7 +1,7 @@ ref: as: openshift-microshift-infra-pmlogs cli: latest - from: microshift-test-payload + from: test-runtime commands: openshift-microshift-infra-pmlogs-commands.sh resources: requests: diff --git a/ci-operator/step-registry/openshift/microshift/infra/rpm-install-aws/openshift-microshift-infra-rpm-install-aws-commands.sh b/ci-operator/step-registry/openshift/microshift/infra/rpm-install-aws/openshift-microshift-infra-rpm-install-aws-commands.sh index 40ada17f0251d..e7ac57ad3a552 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/rpm-install-aws/openshift-microshift-infra-rpm-install-aws-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/infra/rpm-install-aws/openshift-microshift-infra-rpm-install-aws-commands.sh @@ -20,53 +20,44 @@ Host ${IP_ADDRESS} EOF chmod 0600 "${HOME}/.ssh/config" +cat << EOF > /tmp/config.yaml +apiServer: + subjectAltNames: + - ${IP_ADDRESS} +EOF + cat < /tmp/install.sh #!/bin/bash set -xeuo pipefail -rpm --rebuilddb -dnf install subscription-manager -y - -subscription-manager register \ +sudo subscription-manager register \ --org="$(cat /var/run/rhsm/subscription-manager-org)" \ --activationkey="$(cat /var/run/rhsm/subscription-manager-act-key)" -mkdir -p /etc/microshift -cat << EOF2 > /etc/microshift/config.yaml -apiServer: - subjectAltNames: - - ${IP_ADDRESS} -EOF2 - -useradd -m -G wheel microshift -echo -e 'microshift\tALL=(ALL)\tNOPASSWD: ALL' > /etc/sudoers.d/microshift +sudo mkdir -p /etc/microshift +sudo mv /tmp/config.yaml /etc/microshift/config.yaml -OPTS="" -if grep "\-\-no-build-deps" /tmp/configure-vm.sh; then - OPTS="--no-build-deps --force-firewall" -fi -cd /home/microshift && sudo -nu microshift bash -x /tmp/configure-vm.sh --no-build \${OPTS} /tmp/pull-secret - -mkdir -p /tmp/rpms -tar -xhvf /tmp/rpms.tar --strip-components 2 -C /tmp/rpms -dnf localinstall -y \$(find /tmp/rpms/ -iname "*\$(uname -p)*" -or -iname '*noarch*') - -# 4.12 and 4.13 don't set up cri-o pull secret in case of --no-build -if [ ! -e /etc/crio/openshift-pull-secret ]; then - cp /tmp/pull-secret /etc/crio/openshift-pull-secret - chmod 600 /etc/crio/openshift-pull-secret -fi +tar -xf /tmp/microshift.tgz -C ~ --strip-components 4 +cd ~/microshift +./scripts/devenv-builder/configure-vm.sh --force-firewall --no-build /tmp/pull-secret +sudo dnf clean all -y +make rpm +sudo dnf localinstall -y ./_output/rpmbuild/RPMS/*/*.rpm +sudo systemctl enable --now crio +sudo systemctl enable --now microshift EOF chmod +x /tmp/install.sh +tar czf /tmp/microshift.tgz /go/src/github.com/openshift/microshift + scp \ - /rpms.tar \ /tmp/install.sh \ - /microshift/scripts/devenv-builder/configure-vm.sh \ "${CLUSTER_PROFILE_DIR}/pull-secret" \ + /tmp/microshift.tgz \ + /tmp/config.yaml \ "${INSTANCE_PREFIX}:/tmp" -ssh "${INSTANCE_PREFIX}" "sudo /tmp/install.sh" +ssh "${INSTANCE_PREFIX}" "/tmp/install.sh" echo 1 > "${SHARED_DIR}/num_vms" echo "${HOST_USER}" > "${SHARED_DIR}/vm_user_0" diff --git a/ci-operator/step-registry/openshift/microshift/infra/rpm-install-aws/openshift-microshift-infra-rpm-install-aws-ref.yaml b/ci-operator/step-registry/openshift/microshift/infra/rpm-install-aws/openshift-microshift-infra-rpm-install-aws-ref.yaml index 1ca895818da4f..3d925c2c12368 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/rpm-install-aws/openshift-microshift-infra-rpm-install-aws-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/infra/rpm-install-aws/openshift-microshift-infra-rpm-install-aws-ref.yaml @@ -1,6 +1,6 @@ ref: as: openshift-microshift-infra-rpm-install-aws - from: microshift-test-payload + from: src grace_period: 10m commands: openshift-microshift-infra-rpm-install-aws-commands.sh resources: diff --git a/ci-operator/step-registry/openshift/microshift/infra/wait-for-cluster-up-aws/openshift-microshift-infra-wait-for-cluster-up-aws-commands.sh b/ci-operator/step-registry/openshift/microshift/infra/wait-for-cluster-up-aws/openshift-microshift-infra-wait-for-cluster-up-aws-commands.sh index ab2e8f1dd62cc..7543bb8bd8674 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/wait-for-cluster-up-aws/openshift-microshift-infra-wait-for-cluster-up-aws-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/infra/wait-for-cluster-up-aws/openshift-microshift-infra-wait-for-cluster-up-aws-commands.sh @@ -50,7 +50,6 @@ EOF chmod +x "${HOME}"/start_microshift.sh -scp -r /microshift/validate-microshift "${INSTANCE_PREFIX}":~/validate-microshift scp "${HOME}"/start_microshift.sh "${INSTANCE_PREFIX}":~/start_microshift.sh ssh "${INSTANCE_PREFIX}" "/home/${HOST_USER}/start_microshift.sh" diff --git a/ci-operator/step-registry/openshift/microshift/infra/wait-for-cluster-up-aws/openshift-microshift-infra-wait-for-cluster-up-aws-ref.yaml b/ci-operator/step-registry/openshift/microshift/infra/wait-for-cluster-up-aws/openshift-microshift-infra-wait-for-cluster-up-aws-ref.yaml index 2f0348bff206a..2ace6a16d094f 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/wait-for-cluster-up-aws/openshift-microshift-infra-wait-for-cluster-up-aws-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/infra/wait-for-cluster-up-aws/openshift-microshift-infra-wait-for-cluster-up-aws-ref.yaml @@ -1,6 +1,7 @@ ref: as: openshift-microshift-infra-wait-for-cluster-up-aws - from: microshift-test-payload + cli: latest + from: test-runtime grace_period: 10m commands: openshift-microshift-infra-wait-for-cluster-up-aws-commands.sh resources: From ea7a8224daf50431f97951df0762dabf25244a2f Mon Sep 17 00:00:00 2001 From: Pablo Acevedo Montserrat Date: Tue, 20 Jun 2023 00:18:55 +0200 Subject: [PATCH 2/3] ushift: use shared_dir for kubeconfig --- ...nshift-microshift-e2e-metal-tests-ref.yaml | 2 +- ...nshift-conformance-reduced-aws-commands.sh | 21 +------------------ ...enshift-microshift-infra-iso-boot-ref.yaml | 2 +- ...nshift-microshift-infra-iso-build-ref.yaml | 2 +- ...-infra-wait-for-cluster-up-aws-commands.sh | 6 +++--- 5 files changed, 7 insertions(+), 26 deletions(-) diff --git a/ci-operator/step-registry/openshift/microshift/e2e/metal-tests/openshift-microshift-e2e-metal-tests-ref.yaml b/ci-operator/step-registry/openshift/microshift/e2e/metal-tests/openshift-microshift-e2e-metal-tests-ref.yaml index 00ac530855ac9..425ea90f20161 100644 --- a/ci-operator/step-registry/openshift/microshift/e2e/metal-tests/openshift-microshift-e2e-metal-tests-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/e2e/metal-tests/openshift-microshift-e2e-metal-tests-ref.yaml @@ -1,7 +1,7 @@ ref: as: openshift-microshift-e2e-metal-tests cli: latest - from: microshift-test-payload + from: src commands: openshift-microshift-e2e-metal-tests-commands.sh resources: requests: diff --git a/ci-operator/step-registry/openshift/microshift/e2e/openshift-conformance-reduced-aws/openshift-microshift-e2e-openshift-conformance-reduced-aws-commands.sh b/ci-operator/step-registry/openshift/microshift/e2e/openshift-conformance-reduced-aws/openshift-microshift-e2e-openshift-conformance-reduced-aws-commands.sh index 1bf90430b8641..07179f8cb9542 100644 --- a/ci-operator/step-registry/openshift/microshift/e2e/openshift-conformance-reduced-aws/openshift-microshift-e2e-openshift-conformance-reduced-aws-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/e2e/openshift-conformance-reduced-aws/openshift-microshift-e2e-openshift-conformance-reduced-aws-commands.sh @@ -4,23 +4,6 @@ set -xeuo pipefail trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM -IP_ADDRESS="$(cat ${SHARED_DIR}/public_address)" -HOST_USER="$(cat ${SHARED_DIR}/ssh_user)" -INSTANCE_PREFIX="${HOST_USER}@${IP_ADDRESS}" - -echo "Using Host $IP_ADDRESS" - -mkdir -p "${HOME}/.ssh" -cat <"${HOME}/.ssh/config" -Host ${IP_ADDRESS} - User ${HOST_USER} - IdentityFile ${CLUSTER_PROFILE_DIR}/ssh-privatekey - StrictHostKeyChecking accept-new - ServerAliveInterval 30 - ServerAliveCountMax 1200 -EOF -chmod 0600 "${HOME}/.ssh/config" - cat <<'EOF' > "${HOME}"/suite.txt "[sig-api-machinery] AdmissionWebhook [Privileged:ClusterAdmin] listing mutating webhooks should work [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]" "[sig-api-machinery] AdmissionWebhook [Privileged:ClusterAdmin] listing validating webhooks should work [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]" @@ -548,6 +531,4 @@ cat <<'EOF' > "${HOME}"/suite.txt EOF chmod +r "${HOME}/suite.txt" -ssh "${INSTANCE_PREFIX}" "sudo cat /var/lib/microshift/resources/kubeadmin/${IP_ADDRESS}/kubeconfig" >/tmp/kubeconfig - -KUBECONFIG=/tmp/kubeconfig openshift-tests run -v 2 --provider=none -f "${HOME}/suite.txt" -o "${ARTIFACT_DIR}/e2e.log" --junit-dir "${ARTIFACT_DIR}/junit" +KUBECONFIG="${SHARED_DIR}/kubeconfig" openshift-tests run -v 2 --provider=none -f "${HOME}/suite.txt" -o "${ARTIFACT_DIR}/e2e.log" --junit-dir "${ARTIFACT_DIR}/junit" diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-boot/openshift-microshift-infra-iso-boot-ref.yaml b/ci-operator/step-registry/openshift/microshift/infra/iso-boot/openshift-microshift-infra-iso-boot-ref.yaml index 0e9e413856e25..51cbe3d138df0 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-boot/openshift-microshift-infra-iso-boot-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-boot/openshift-microshift-infra-iso-boot-ref.yaml @@ -1,6 +1,6 @@ ref: as: openshift-microshift-infra-iso-boot - from: microshift-test-payload + from: src grace_period: 10m commands: openshift-microshift-infra-iso-boot-commands.sh resources: diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-ref.yaml b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-ref.yaml index 4d929614f2971..d0122c7d033b6 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-ref.yaml @@ -1,6 +1,6 @@ ref: as: openshift-microshift-infra-iso-build - from: microshift-test-payload + from: src grace_period: 10m commands: openshift-microshift-infra-iso-build-commands.sh resources: diff --git a/ci-operator/step-registry/openshift/microshift/infra/wait-for-cluster-up-aws/openshift-microshift-infra-wait-for-cluster-up-aws-commands.sh b/ci-operator/step-registry/openshift/microshift/infra/wait-for-cluster-up-aws/openshift-microshift-infra-wait-for-cluster-up-aws-commands.sh index 7543bb8bd8674..05ca7b521c2c5 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/wait-for-cluster-up-aws/openshift-microshift-infra-wait-for-cluster-up-aws-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/infra/wait-for-cluster-up-aws/openshift-microshift-infra-wait-for-cluster-up-aws-commands.sh @@ -53,7 +53,7 @@ chmod +x "${HOME}"/start_microshift.sh scp "${HOME}"/start_microshift.sh "${INSTANCE_PREFIX}":~/start_microshift.sh ssh "${INSTANCE_PREFIX}" "/home/${HOST_USER}/start_microshift.sh" -ssh "${INSTANCE_PREFIX}" "sudo cat /var/lib/microshift/resources/kubeadmin/${IP_ADDRESS}/kubeconfig" >/tmp/kubeconfig +ssh "${INSTANCE_PREFIX}" "sudo cat /var/lib/microshift/resources/kubeadmin/${IP_ADDRESS}/kubeconfig" > "${SHARED_DIR}/kubeconfig" # Disable exit-on-error and enable command logging with a timestamp set +e @@ -64,7 +64,7 @@ retries=3 while [ ${retries} -gt 0 ] ; do ((retries-=1)) - KUBECONFIG=/tmp/kubeconfig oc wait \ + KUBECONFIG="${SHARED_DIR}/kubeconfig" oc wait \ pod \ --for=condition=ready \ -l='app.kubernetes.io/name=topolvm-csi-driver' \ @@ -74,7 +74,7 @@ while [ ${retries} -gt 0 ] ; do # Image pull operation sometimes get stuck for topolvm images # Delete topolvm pods to retry image pull operation - KUBECONFIG=/tmp/kubeconfig oc delete \ + KUBECONFIG="${SHARED_DIR}/kubeconfig" oc delete \ pod \ -l='app.kubernetes.io/name=topolvm-csi-driver' \ -n openshift-storage \ From 5b949726d00faeda40f7faf3a6550a98deb75d36 Mon Sep 17 00:00:00 2001 From: Pablo Acevedo Montserrat Date: Fri, 21 Jul 2023 00:07:15 +0200 Subject: [PATCH 3/3] ushift: remove test payload from metal --- .../openshift-microshift-infra-iso-build-commands.sh | 5 +++-- .../rebase/openshift-microshift-rebase-commands.sh | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh index 3f5622af004a4..b8fba4d0e1dbf 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh @@ -31,7 +31,8 @@ if ! sudo subscription-manager status >&/dev/null; then fi chmod 0755 ~ -tar -xf /tmp/microshift.tgz -C ~ +tar -xf /tmp/microshift.tgz -C ~ --strip-components 4 + cp /tmp/ssh-publickey ~/.ssh/id_rsa.pub cp /tmp/ssh-privatekey ~/.ssh/id_rsa @@ -47,7 +48,7 @@ cd ~/microshift EOF chmod +x /tmp/iso.sh -tar czf /tmp/microshift.tgz /microshift +tar czf /tmp/microshift.tgz /go/src/github.com/openshift/microshift scp \ /tmp/iso.sh \ diff --git a/ci-operator/step-registry/openshift/microshift/rebase/openshift-microshift-rebase-commands.sh b/ci-operator/step-registry/openshift/microshift/rebase/openshift-microshift-rebase-commands.sh index d5743fd49ca5b..299897bfb0caa 100644 --- a/ci-operator/step-registry/openshift/microshift/rebase/openshift-microshift-rebase-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/rebase/openshift-microshift-rebase-commands.sh @@ -5,4 +5,9 @@ if [[ "$JOB_NAME" == rehearse* ]]; then export DRY_RUN=y fi +echo "${KUBECONFIG}" +cat "${KUBECONFIG}" + +oc config view + ./scripts/auto-rebase/rebase_job_entrypoint.sh