From c152067c0c010a1b217659d32cec8022859425c8 Mon Sep 17 00:00:00 2001 From: Amber Brown Date: Thu, 13 Jul 2023 11:33:00 +1000 Subject: [PATCH 1/2] see if this fixes the mustgather --- .pipelines/e2e.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pipelines/e2e.yml b/.pipelines/e2e.yml index b306d991df0..90fb218d04e 100644 --- a/.pipelines/e2e.yml +++ b/.pipelines/e2e.yml @@ -30,7 +30,7 @@ jobs: - script: | set -xe sudo rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm - sudo dnf install -y openvpn make podman + sudo dnf install -y openvpn make podman jq azure-cli displayName: Setup (Container) target: container @@ -86,7 +86,7 @@ jobs: hack/get-admin-kubeconfig.sh /subscriptions/$AZURE_SUBSCRIPTION_ID/resourceGroups/$CLUSTER/providers/Microsoft.RedHatOpenShift/openShiftClusters/$CLUSTER >admin.kubeconfig export KUBECONFIG=admin.kubeconfig - wget https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/$(OpenShiftVersion)/openshift-client-linux-$(OpenShiftVersion).tar.gz + wget -nv https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/$(OpenShiftVersion)/openshift-client-linux-$(OpenShiftVersion).tar.gz tar xf openshift-client-linux-$(OpenShiftVersion).tar.gz ./oc adm must-gather tar cf must-gather.tar.gz must-gather.local.* From b4f38de1b9d93d02dfd6007eb4b2a761bb8aa77a Mon Sep 17 00:00:00 2001 From: Amber Brown Date: Thu, 13 Jul 2023 12:01:15 +1000 Subject: [PATCH 2/2] see if this fixes the mustgather --- .pipelines/e2e.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.pipelines/e2e.yml b/.pipelines/e2e.yml index 90fb218d04e..90edc5c18ed 100644 --- a/.pipelines/e2e.yml +++ b/.pipelines/e2e.yml @@ -30,7 +30,7 @@ jobs: - script: | set -xe sudo rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm - sudo dnf install -y openvpn make podman jq azure-cli + sudo dnf install -y openvpn make podman displayName: Setup (Container) target: container @@ -92,12 +92,10 @@ jobs: tar cf must-gather.tar.gz must-gather.local.* displayName: Collect must-gather condition: failed() - target: container - publish: must-gather.tar.gz artifact: must-gather displayName: Append must-gather to Pipeline condition: failed() - target: container - script: | export CI=true