From ca128aad50f9491af4ef0ebf5c165a89a2477a16 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 26 Feb 2020 12:17:34 +0100 Subject: [PATCH 001/100] First draft --- ...enshift-installer-baremetal-ds-master.yaml | 84 +++++++++++++++++ ...taller-baremetal-ds-master-presubmits.yaml | 89 +++++++++++++++++++ .../ds/e2e/baremetal-ds-e2e-workflow.yaml | 12 +++ .../test/baremetal-ds-e2e-test-commands.sh | 17 ++++ .../e2e/test/baremetal-ds-e2e-test-ref.yaml | 12 +++ 5 files changed, 214 insertions(+) create mode 100644 ci-operator/config/openshift/installer-baremetal-ds/openshift-installer-baremetal-ds-master.yaml create mode 100644 ci-operator/jobs/openshift/installer-baremetal-ds/openshift-installer-baremetal-ds-master-presubmits.yaml create mode 100644 ci-operator/step-registry/baremetal/ds/e2e/baremetal-ds-e2e-workflow.yaml create mode 100644 ci-operator/step-registry/baremetal/ds/e2e/test/baremetal-ds-e2e-test-commands.sh create mode 100644 ci-operator/step-registry/baremetal/ds/e2e/test/baremetal-ds-e2e-test-ref.yaml diff --git a/ci-operator/config/openshift/installer-baremetal-ds/openshift-installer-baremetal-ds-master.yaml b/ci-operator/config/openshift/installer-baremetal-ds/openshift-installer-baremetal-ds-master.yaml new file mode 100644 index 0000000000000..87585a8f427de --- /dev/null +++ b/ci-operator/config/openshift/installer-baremetal-ds/openshift-installer-baremetal-ds-master.yaml @@ -0,0 +1,84 @@ +base_images: + base: + cluster: https://api.ci.openshift.org + name: "4.5" + namespace: ocp + tag: base +build_root: + image_stream_tag: + cluster: https://api.ci.openshift.org + name: release + namespace: openshift + tag: golang-1.13 +images: +- dockerfile_path: images/installer/Dockerfile.ci + from: base + inputs: + root: + as: + - builder + paths: null + to: installer +- dockerfile_path: images/installer-artifacts/Dockerfile.rhel + from: installer + inputs: + root: + as: + - builder + paths: null + to: installer-artifacts +- dockerfile_path: images/libvirt/Dockerfile.ci + from: base + inputs: + root: + as: + - builder + paths: null + to: libvirt-installer +- dockerfile_path: images/installer/Dockerfile.upi.ci + from: base + inputs: + root: + as: + - builder + paths: null + to: upi-installer +promotion: + name: "4.5" + namespace: ocp +resources: + '*': + limits: {} + requests: + cpu: 100m + memory: 200Mi + installer: + limits: {} + requests: + cpu: "3" + memory: 5Gi + installer-artifacts: + limits: {} + requests: + cpu: "3" + memory: 5Gi + libvirt-installer: + limits: {} + requests: + cpu: "3" + memory: 5Gi + upi-installer: + limits: {} + requests: + cpu: "3" + memory: 5Gi +tag_specification: + cluster: https://api.ci.openshift.org + name: "4.5" + namespace: ocp +tests: +- as: e2e-baremetal-ds-steps + commands: "" + steps: + cluster_profile: packet + workflow: baremetal-ds-e2e diff --git a/ci-operator/jobs/openshift/installer-baremetal-ds/openshift-installer-baremetal-ds-master-presubmits.yaml b/ci-operator/jobs/openshift/installer-baremetal-ds/openshift-installer-baremetal-ds-master-presubmits.yaml new file mode 100644 index 0000000000000..89d3ca4d80d85 --- /dev/null +++ b/ci-operator/jobs/openshift/installer-baremetal-ds/openshift-installer-baremetal-ds-master-presubmits.yaml @@ -0,0 +1,89 @@ +presubmits: + openshift/installer: + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/e2e-baremetal-ds-steps + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-installer-baremetal-ds-master-e2e-steps + optional: true + rerun_command: /test e2e-baremetal-ds-steps + skip_report: true + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --branch=master + - --give-pr-author-access-to-namespace=true + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org + - --org=openshift + - --repo=installer + - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org + - --secret-dir=/usr/local/e2e-baremetal-ds-steps-cluster-profile + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=e2e-baremetal-ds-steps + command: + - ci-operator + env: + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: openshift-installer-baremetal-ds-master.yaml + name: ci-operator-master-configs + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-baremetal-ds-steps-cluster-profile + name: cluster-profile + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/sentry-dsn + name: sentry-dsn + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-aws + - name: pull-secret + secret: + secretName: regcred + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: (?m)^/test( | .* )e2e-steps,?($|\s.*) diff --git a/ci-operator/step-registry/baremetal/ds/e2e/baremetal-ds-e2e-workflow.yaml b/ci-operator/step-registry/baremetal/ds/e2e/baremetal-ds-e2e-workflow.yaml new file mode 100644 index 0000000000000..dfdccefce704a --- /dev/null +++ b/ci-operator/step-registry/baremetal/ds/e2e/baremetal-ds-e2e-workflow.yaml @@ -0,0 +1,12 @@ +workflow: + as: baremetal-ds-e2e + steps: + #pre: + #- ref: ipi-conf + #- chain: ipi-install + test: + - ref: baremetal-ds-e2e-test + #post: + #- chain: ipi-deprovision + documentation: |- + The Baremetal DS E2E workflow executes the common end-to-end test suite. diff --git a/ci-operator/step-registry/baremetal/ds/e2e/test/baremetal-ds-e2e-test-commands.sh b/ci-operator/step-registry/baremetal/ds/e2e/test/baremetal-ds-e2e-test-commands.sh new file mode 100644 index 0000000000000..8ce5fae3af1ab --- /dev/null +++ b/ci-operator/step-registry/baremetal/ds/e2e/test/baremetal-ds-e2e-test-commands.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +set -o nounset +set -o errexit +set -o pipefail + +echo "Baremetal DS test commands executed" + +#test_suite=openshift/conformance/parallel +#if [[ -e "${SHARED_DIR}/test-suite.txt" ]]; then +# test_suite=$(<"${SHARED_DIR}/test-suite.txt") +#fi +# +#openshift-tests run "${test_suite}" \ +# --provider "${TEST_PROVIDER}" \ +# -o /tmp/artifacts/e2e.log \ +# --junit-dir /tmp/artifacts/junit diff --git a/ci-operator/step-registry/baremetal/ds/e2e/test/baremetal-ds-e2e-test-ref.yaml b/ci-operator/step-registry/baremetal/ds/e2e/test/baremetal-ds-e2e-test-ref.yaml new file mode 100644 index 0000000000000..b519726a74c2a --- /dev/null +++ b/ci-operator/step-registry/baremetal/ds/e2e/test/baremetal-ds-e2e-test-ref.yaml @@ -0,0 +1,12 @@ +ref: + as: baremetal-ds-e2e-test + from: stable:tests + commands: baremetal-ds-e2e-test-commands.sh + resources: + requests: + cpu: "3" + memory: 600Mi + limits: + memory: 4Gi + documentation: |- + The Baremtal DS E2E step executes the common end-to-end test suite. From 7658d03302c50fc9d082e14c2e8bcb8f3fb3f0bf Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 26 Feb 2020 12:30:00 +0100 Subject: [PATCH 002/100] Adding OWNERS file --- ci-operator/config/openshift/installer-baremetal-ds/OWNERS | 5 +++++ ci-operator/jobs/openshift/installer-baremetal-ds/OWNERS | 5 +++++ ci-operator/step-registry/baremetal/OWNERS | 5 +++++ ci-operator/step-registry/baremetal/ds/OWNERS | 5 +++++ ci-operator/step-registry/baremetal/ds/e2e/OWNERS | 5 +++++ ci-operator/step-registry/baremetal/ds/e2e/test/OWNERS | 5 +++++ 6 files changed, 30 insertions(+) create mode 100644 ci-operator/config/openshift/installer-baremetal-ds/OWNERS create mode 100644 ci-operator/jobs/openshift/installer-baremetal-ds/OWNERS create mode 100644 ci-operator/step-registry/baremetal/OWNERS create mode 100644 ci-operator/step-registry/baremetal/ds/OWNERS create mode 100644 ci-operator/step-registry/baremetal/ds/e2e/OWNERS create mode 100644 ci-operator/step-registry/baremetal/ds/e2e/test/OWNERS diff --git a/ci-operator/config/openshift/installer-baremetal-ds/OWNERS b/ci-operator/config/openshift/installer-baremetal-ds/OWNERS new file mode 100644 index 0000000000000..7d31b83a90990 --- /dev/null +++ b/ci-operator/config/openshift/installer-baremetal-ds/OWNERS @@ -0,0 +1,5 @@ +approvers: +- andfasano +- akiselev +- derekhiggins +- honza diff --git a/ci-operator/jobs/openshift/installer-baremetal-ds/OWNERS b/ci-operator/jobs/openshift/installer-baremetal-ds/OWNERS new file mode 100644 index 0000000000000..7d31b83a90990 --- /dev/null +++ b/ci-operator/jobs/openshift/installer-baremetal-ds/OWNERS @@ -0,0 +1,5 @@ +approvers: +- andfasano +- akiselev +- derekhiggins +- honza diff --git a/ci-operator/step-registry/baremetal/OWNERS b/ci-operator/step-registry/baremetal/OWNERS new file mode 100644 index 0000000000000..7d31b83a90990 --- /dev/null +++ b/ci-operator/step-registry/baremetal/OWNERS @@ -0,0 +1,5 @@ +approvers: +- andfasano +- akiselev +- derekhiggins +- honza diff --git a/ci-operator/step-registry/baremetal/ds/OWNERS b/ci-operator/step-registry/baremetal/ds/OWNERS new file mode 100644 index 0000000000000..7d31b83a90990 --- /dev/null +++ b/ci-operator/step-registry/baremetal/ds/OWNERS @@ -0,0 +1,5 @@ +approvers: +- andfasano +- akiselev +- derekhiggins +- honza diff --git a/ci-operator/step-registry/baremetal/ds/e2e/OWNERS b/ci-operator/step-registry/baremetal/ds/e2e/OWNERS new file mode 100644 index 0000000000000..7d31b83a90990 --- /dev/null +++ b/ci-operator/step-registry/baremetal/ds/e2e/OWNERS @@ -0,0 +1,5 @@ +approvers: +- andfasano +- akiselev +- derekhiggins +- honza diff --git a/ci-operator/step-registry/baremetal/ds/e2e/test/OWNERS b/ci-operator/step-registry/baremetal/ds/e2e/test/OWNERS new file mode 100644 index 0000000000000..7d31b83a90990 --- /dev/null +++ b/ci-operator/step-registry/baremetal/ds/e2e/test/OWNERS @@ -0,0 +1,5 @@ +approvers: +- andfasano +- akiselev +- derekhiggins +- honza From 1817f086f6c23581f040868c27c39a9f1af42c57 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 26 Feb 2020 12:39:38 +0100 Subject: [PATCH 003/100] Fixing correct OWNERS users --- ci-operator/config/openshift/installer-baremetal-ds/OWNERS | 2 +- ci-operator/jobs/openshift/installer-baremetal-ds/OWNERS | 2 +- ci-operator/step-registry/baremetal/OWNERS | 2 +- ci-operator/step-registry/baremetal/ds/OWNERS | 2 +- ci-operator/step-registry/baremetal/ds/e2e/OWNERS | 2 +- ci-operator/step-registry/baremetal/ds/e2e/test/OWNERS | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci-operator/config/openshift/installer-baremetal-ds/OWNERS b/ci-operator/config/openshift/installer-baremetal-ds/OWNERS index 7d31b83a90990..3ba207e71e301 100644 --- a/ci-operator/config/openshift/installer-baremetal-ds/OWNERS +++ b/ci-operator/config/openshift/installer-baremetal-ds/OWNERS @@ -1,5 +1,5 @@ approvers: - andfasano -- akiselev +- akiselev1 - derekhiggins - honza diff --git a/ci-operator/jobs/openshift/installer-baremetal-ds/OWNERS b/ci-operator/jobs/openshift/installer-baremetal-ds/OWNERS index 7d31b83a90990..3ba207e71e301 100644 --- a/ci-operator/jobs/openshift/installer-baremetal-ds/OWNERS +++ b/ci-operator/jobs/openshift/installer-baremetal-ds/OWNERS @@ -1,5 +1,5 @@ approvers: - andfasano -- akiselev +- akiselev1 - derekhiggins - honza diff --git a/ci-operator/step-registry/baremetal/OWNERS b/ci-operator/step-registry/baremetal/OWNERS index 7d31b83a90990..3ba207e71e301 100644 --- a/ci-operator/step-registry/baremetal/OWNERS +++ b/ci-operator/step-registry/baremetal/OWNERS @@ -1,5 +1,5 @@ approvers: - andfasano -- akiselev +- akiselev1 - derekhiggins - honza diff --git a/ci-operator/step-registry/baremetal/ds/OWNERS b/ci-operator/step-registry/baremetal/ds/OWNERS index 7d31b83a90990..3ba207e71e301 100644 --- a/ci-operator/step-registry/baremetal/ds/OWNERS +++ b/ci-operator/step-registry/baremetal/ds/OWNERS @@ -1,5 +1,5 @@ approvers: - andfasano -- akiselev +- akiselev1 - derekhiggins - honza diff --git a/ci-operator/step-registry/baremetal/ds/e2e/OWNERS b/ci-operator/step-registry/baremetal/ds/e2e/OWNERS index 7d31b83a90990..3ba207e71e301 100644 --- a/ci-operator/step-registry/baremetal/ds/e2e/OWNERS +++ b/ci-operator/step-registry/baremetal/ds/e2e/OWNERS @@ -1,5 +1,5 @@ approvers: - andfasano -- akiselev +- akiselev1 - derekhiggins - honza diff --git a/ci-operator/step-registry/baremetal/ds/e2e/test/OWNERS b/ci-operator/step-registry/baremetal/ds/e2e/test/OWNERS index 7d31b83a90990..3ba207e71e301 100644 --- a/ci-operator/step-registry/baremetal/ds/e2e/test/OWNERS +++ b/ci-operator/step-registry/baremetal/ds/e2e/test/OWNERS @@ -1,5 +1,5 @@ approvers: - andfasano -- akiselev +- akiselev1 - derekhiggins - honza From 746cf8626994ae2ff39376b6bb7537d679953ba2 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 26 Feb 2020 12:50:53 +0100 Subject: [PATCH 004/100] Folders and files renaming --- .../OWNERS | 0 .../openshift-installer-baremetalds-master.yaml} | 4 ++-- .../OWNERS | 0 ...t-installer-baremetalds-master-presubmits.yaml} | 14 +++++++------- .../step-registry/baremetal/ds/e2e/test/OWNERS | 5 ----- .../{baremetal => baremetalds}/OWNERS | 0 .../{baremetal/ds => baremetalds/e2e}/OWNERS | 0 .../e2e/baremetalds-e2e-workflow.yaml} | 4 ++-- .../ds/e2e => baremetalds/e2e/test}/OWNERS | 0 .../e2e/test/baremetalds-e2e-test-commands.sh} | 0 .../e2e/test/baremetalds-e2e-test-ref.yaml} | 4 ++-- 11 files changed, 13 insertions(+), 18 deletions(-) rename ci-operator/config/openshift/{installer-baremetal-ds => installer-baremetalds}/OWNERS (100%) rename ci-operator/config/openshift/{installer-baremetal-ds/openshift-installer-baremetal-ds-master.yaml => installer-baremetalds/openshift-installer-baremetalds-master.yaml} (96%) rename ci-operator/jobs/openshift/{installer-baremetal-ds => installer-baremetalds}/OWNERS (100%) rename ci-operator/jobs/openshift/{installer-baremetal-ds/openshift-installer-baremetal-ds-master-presubmits.yaml => installer-baremetalds/openshift-installer-baremetalds-master-presubmits.yaml} (85%) delete mode 100644 ci-operator/step-registry/baremetal/ds/e2e/test/OWNERS rename ci-operator/step-registry/{baremetal => baremetalds}/OWNERS (100%) rename ci-operator/step-registry/{baremetal/ds => baremetalds/e2e}/OWNERS (100%) rename ci-operator/step-registry/{baremetal/ds/e2e/baremetal-ds-e2e-workflow.yaml => baremetalds/e2e/baremetalds-e2e-workflow.yaml} (80%) rename ci-operator/step-registry/{baremetal/ds/e2e => baremetalds/e2e/test}/OWNERS (100%) rename ci-operator/step-registry/{baremetal/ds/e2e/test/baremetal-ds-e2e-test-commands.sh => baremetalds/e2e/test/baremetalds-e2e-test-commands.sh} (100%) rename ci-operator/step-registry/{baremetal/ds/e2e/test/baremetal-ds-e2e-test-ref.yaml => baremetalds/e2e/test/baremetalds-e2e-test-ref.yaml} (73%) diff --git a/ci-operator/config/openshift/installer-baremetal-ds/OWNERS b/ci-operator/config/openshift/installer-baremetalds/OWNERS similarity index 100% rename from ci-operator/config/openshift/installer-baremetal-ds/OWNERS rename to ci-operator/config/openshift/installer-baremetalds/OWNERS diff --git a/ci-operator/config/openshift/installer-baremetal-ds/openshift-installer-baremetal-ds-master.yaml b/ci-operator/config/openshift/installer-baremetalds/openshift-installer-baremetalds-master.yaml similarity index 96% rename from ci-operator/config/openshift/installer-baremetal-ds/openshift-installer-baremetal-ds-master.yaml rename to ci-operator/config/openshift/installer-baremetalds/openshift-installer-baremetalds-master.yaml index 87585a8f427de..df533bfc7967d 100644 --- a/ci-operator/config/openshift/installer-baremetal-ds/openshift-installer-baremetal-ds-master.yaml +++ b/ci-operator/config/openshift/installer-baremetalds/openshift-installer-baremetalds-master.yaml @@ -77,8 +77,8 @@ tag_specification: name: "4.5" namespace: ocp tests: -- as: e2e-baremetal-ds-steps +- as: e2e-baremetalds-steps commands: "" steps: cluster_profile: packet - workflow: baremetal-ds-e2e + workflow: baremetalds-e2e diff --git a/ci-operator/jobs/openshift/installer-baremetal-ds/OWNERS b/ci-operator/jobs/openshift/installer-baremetalds/OWNERS similarity index 100% rename from ci-operator/jobs/openshift/installer-baremetal-ds/OWNERS rename to ci-operator/jobs/openshift/installer-baremetalds/OWNERS diff --git a/ci-operator/jobs/openshift/installer-baremetal-ds/openshift-installer-baremetal-ds-master-presubmits.yaml b/ci-operator/jobs/openshift/installer-baremetalds/openshift-installer-baremetalds-master-presubmits.yaml similarity index 85% rename from ci-operator/jobs/openshift/installer-baremetal-ds/openshift-installer-baremetal-ds-master-presubmits.yaml rename to ci-operator/jobs/openshift/installer-baremetalds/openshift-installer-baremetalds-master-presubmits.yaml index 89d3ca4d80d85..28213a9f4a0ff 100644 --- a/ci-operator/jobs/openshift/installer-baremetal-ds/openshift-installer-baremetal-ds-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer-baremetalds/openshift-installer-baremetalds-master-presubmits.yaml @@ -4,16 +4,16 @@ presubmits: always_run: true branches: - master - context: ci/prow/e2e-baremetal-ds-steps + context: ci/prow/e2e-baremetalds-steps decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-installer-baremetal-ds-master-e2e-steps + name: pull-ci-openshift-installer-baremetalds-master-e2e-steps optional: true - rerun_command: /test e2e-baremetal-ds-steps + rerun_command: /test e2e-baremetalds-steps skip_report: true spec: containers: @@ -29,16 +29,16 @@ presubmits: - --org=openshift - --repo=installer - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org - - --secret-dir=/usr/local/e2e-baremetal-ds-steps-cluster-profile + - --secret-dir=/usr/local/e2e-baremetalds-steps-cluster-profile - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-baremetal-ds-steps + - --target=e2e-baremetalds-steps command: - ci-operator env: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: openshift-installer-baremetal-ds-master.yaml + key: openshift-installer-baremetalds-master.yaml name: ci-operator-master-configs image: ci-operator:latest imagePullPolicy: Always @@ -53,7 +53,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-baremetal-ds-steps-cluster-profile + - mountPath: /usr/local/e2e-baremetalds-steps-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret diff --git a/ci-operator/step-registry/baremetal/ds/e2e/test/OWNERS b/ci-operator/step-registry/baremetal/ds/e2e/test/OWNERS deleted file mode 100644 index 3ba207e71e301..0000000000000 --- a/ci-operator/step-registry/baremetal/ds/e2e/test/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ -approvers: -- andfasano -- akiselev1 -- derekhiggins -- honza diff --git a/ci-operator/step-registry/baremetal/OWNERS b/ci-operator/step-registry/baremetalds/OWNERS similarity index 100% rename from ci-operator/step-registry/baremetal/OWNERS rename to ci-operator/step-registry/baremetalds/OWNERS diff --git a/ci-operator/step-registry/baremetal/ds/OWNERS b/ci-operator/step-registry/baremetalds/e2e/OWNERS similarity index 100% rename from ci-operator/step-registry/baremetal/ds/OWNERS rename to ci-operator/step-registry/baremetalds/e2e/OWNERS diff --git a/ci-operator/step-registry/baremetal/ds/e2e/baremetal-ds-e2e-workflow.yaml b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml similarity index 80% rename from ci-operator/step-registry/baremetal/ds/e2e/baremetal-ds-e2e-workflow.yaml rename to ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml index dfdccefce704a..5216ae65323c1 100644 --- a/ci-operator/step-registry/baremetal/ds/e2e/baremetal-ds-e2e-workflow.yaml +++ b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml @@ -1,11 +1,11 @@ workflow: - as: baremetal-ds-e2e + as: baremetalds-e2e steps: #pre: #- ref: ipi-conf #- chain: ipi-install test: - - ref: baremetal-ds-e2e-test + - ref: baremetalds-e2e-test #post: #- chain: ipi-deprovision documentation: |- diff --git a/ci-operator/step-registry/baremetal/ds/e2e/OWNERS b/ci-operator/step-registry/baremetalds/e2e/test/OWNERS similarity index 100% rename from ci-operator/step-registry/baremetal/ds/e2e/OWNERS rename to ci-operator/step-registry/baremetalds/e2e/test/OWNERS diff --git a/ci-operator/step-registry/baremetal/ds/e2e/test/baremetal-ds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh similarity index 100% rename from ci-operator/step-registry/baremetal/ds/e2e/test/baremetal-ds-e2e-test-commands.sh rename to ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh diff --git a/ci-operator/step-registry/baremetal/ds/e2e/test/baremetal-ds-e2e-test-ref.yaml b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-ref.yaml similarity index 73% rename from ci-operator/step-registry/baremetal/ds/e2e/test/baremetal-ds-e2e-test-ref.yaml rename to ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-ref.yaml index b519726a74c2a..f54a8af5dd863 100644 --- a/ci-operator/step-registry/baremetal/ds/e2e/test/baremetal-ds-e2e-test-ref.yaml +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-ref.yaml @@ -1,7 +1,7 @@ ref: - as: baremetal-ds-e2e-test + as: baremetalds-e2e-test from: stable:tests - commands: baremetal-ds-e2e-test-commands.sh + commands: baremetalds-e2e-test-commands.sh resources: requests: cpu: "3" From 7786394e8367f9805cb7487c7eae8f5e961b8789 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 26 Feb 2020 13:13:47 +0100 Subject: [PATCH 005/100] Moving back tests under openshift/installer --- .../openshift/installer-baremetalds/OWNERS | 5 -- ...penshift-installer-baremetalds-master.yaml | 84 ----------------- .../installer/openshift-installer-master.yaml | 5 ++ .../openshift/installer-baremetalds/OWNERS | 5 -- ...staller-baremetalds-master-presubmits.yaml | 89 ------------------- ...openshift-installer-master-presubmits.yaml | 87 ++++++++++++++++++ 6 files changed, 92 insertions(+), 183 deletions(-) delete mode 100644 ci-operator/config/openshift/installer-baremetalds/OWNERS delete mode 100644 ci-operator/config/openshift/installer-baremetalds/openshift-installer-baremetalds-master.yaml delete mode 100644 ci-operator/jobs/openshift/installer-baremetalds/OWNERS delete mode 100644 ci-operator/jobs/openshift/installer-baremetalds/openshift-installer-baremetalds-master-presubmits.yaml diff --git a/ci-operator/config/openshift/installer-baremetalds/OWNERS b/ci-operator/config/openshift/installer-baremetalds/OWNERS deleted file mode 100644 index 3ba207e71e301..0000000000000 --- a/ci-operator/config/openshift/installer-baremetalds/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ -approvers: -- andfasano -- akiselev1 -- derekhiggins -- honza diff --git a/ci-operator/config/openshift/installer-baremetalds/openshift-installer-baremetalds-master.yaml b/ci-operator/config/openshift/installer-baremetalds/openshift-installer-baremetalds-master.yaml deleted file mode 100644 index df533bfc7967d..0000000000000 --- a/ci-operator/config/openshift/installer-baremetalds/openshift-installer-baremetalds-master.yaml +++ /dev/null @@ -1,84 +0,0 @@ -base_images: - base: - cluster: https://api.ci.openshift.org - name: "4.5" - namespace: ocp - tag: base -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.13 -images: -- dockerfile_path: images/installer/Dockerfile.ci - from: base - inputs: - root: - as: - - builder - paths: null - to: installer -- dockerfile_path: images/installer-artifacts/Dockerfile.rhel - from: installer - inputs: - root: - as: - - builder - paths: null - to: installer-artifacts -- dockerfile_path: images/libvirt/Dockerfile.ci - from: base - inputs: - root: - as: - - builder - paths: null - to: libvirt-installer -- dockerfile_path: images/installer/Dockerfile.upi.ci - from: base - inputs: - root: - as: - - builder - paths: null - to: upi-installer -promotion: - name: "4.5" - namespace: ocp -resources: - '*': - limits: {} - requests: - cpu: 100m - memory: 200Mi - installer: - limits: {} - requests: - cpu: "3" - memory: 5Gi - installer-artifacts: - limits: {} - requests: - cpu: "3" - memory: 5Gi - libvirt-installer: - limits: {} - requests: - cpu: "3" - memory: 5Gi - upi-installer: - limits: {} - requests: - cpu: "3" - memory: 5Gi -tag_specification: - cluster: https://api.ci.openshift.org - name: "4.5" - namespace: ocp -tests: -- as: e2e-baremetalds-steps - commands: "" - steps: - cluster_profile: packet - workflow: baremetalds-e2e diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml index 045ce71386098..a4e402be14fa0 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml @@ -199,3 +199,8 @@ tests: steps: cluster_profile: aws workflow: origin-e2e +- as: e2e-baremetalds + commands: "" + steps: + cluster_profile: packet + workflow: baremetalds-e2e \ No newline at end of file diff --git a/ci-operator/jobs/openshift/installer-baremetalds/OWNERS b/ci-operator/jobs/openshift/installer-baremetalds/OWNERS deleted file mode 100644 index 3ba207e71e301..0000000000000 --- a/ci-operator/jobs/openshift/installer-baremetalds/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ -approvers: -- andfasano -- akiselev1 -- derekhiggins -- honza diff --git a/ci-operator/jobs/openshift/installer-baremetalds/openshift-installer-baremetalds-master-presubmits.yaml b/ci-operator/jobs/openshift/installer-baremetalds/openshift-installer-baremetalds-master-presubmits.yaml deleted file mode 100644 index 28213a9f4a0ff..0000000000000 --- a/ci-operator/jobs/openshift/installer-baremetalds/openshift-installer-baremetalds-master-presubmits.yaml +++ /dev/null @@ -1,89 +0,0 @@ -presubmits: - openshift/installer: - - agent: kubernetes - always_run: true - branches: - - master - context: ci/prow/e2e-baremetalds-steps - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/prowgen-controlled: "true" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-installer-baremetalds-master-e2e-steps - optional: true - rerun_command: /test e2e-baremetalds-steps - skip_report: true - spec: - containers: - - args: - - --artifact-dir=$(ARTIFACTS) - - --branch=master - - --give-pr-author-access-to-namespace=true - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --kubeconfig=/etc/apici/kubeconfig - - --lease-server-password-file=/etc/boskos/password - - --lease-server-username=ci - - --lease-server=https://boskos-ci.svc.ci.openshift.org - - --org=openshift - - --repo=installer - - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org - - --secret-dir=/usr/local/e2e-baremetalds-steps-cluster-profile - - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-baremetalds-steps - command: - - ci-operator - env: - - name: CONFIG_SPEC - valueFrom: - configMapKeyRef: - key: openshift-installer-baremetalds-master.yaml - name: ci-operator-master-configs - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/apici - name: apici-ci-operator-credentials - readOnly: true - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/e2e-baremetalds-steps-cluster-profile - name: cluster-profile - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/sentry-dsn - name: sentry-dsn - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: apici-ci-operator-credentials - secret: - items: - - key: sa.ci-operator.apici.config - path: kubeconfig - secretName: apici-ci-operator-credentials - - name: boskos - secret: - items: - - key: password - path: password - secretName: boskos-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-aws - - name: pull-secret - secret: - secretName: regcred - - name: sentry-dsn - secret: - secretName: sentry-dsn - trigger: (?m)^/test( | .* )e2e-steps,?($|\s.*) diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml index 8880732ac38b1..c0264e67e16b7 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml @@ -2857,3 +2857,90 @@ presubmits: requests: cpu: 500m trigger: (?m)^/test yaml-lint + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/e2e-baremetalds + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-installer-master-e2e-baremetalds + optional: true + rerun_command: /test e2e-baremetalds + skip_report: true + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --branch=master + - --give-pr-author-access-to-namespace=true + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org + - --org=openshift + - --repo=installer + - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org + - --secret-dir=/usr/local/e2e-baremetalds-cluster-profile + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=e2e-baremetalds + command: + - ci-operator + env: + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: openshift-installer-master.yaml + name: ci-operator-master-configs + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-baremetalds-cluster-profile + name: cluster-profile + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/sentry-dsn + name: sentry-dsn + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-aws + - name: pull-secret + secret: + secretName: regcred + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: (?m)^/test( | .* )e2e-baremetalds,?($|\s.*) From c850ef38ccf5fd9ee404d757a8dfff423f869a63 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 26 Feb 2020 15:21:38 +0100 Subject: [PATCH 006/100] Fixing job order --- ...openshift-installer-master-presubmits.yaml | 174 +++++++++--------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml index c0264e67e16b7..d5667bcbd9779 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml @@ -1123,6 +1123,93 @@ presubmits: secret: secretName: sentry-dsn trigger: (?m)^/test( | .* )e2e-azure-shared-vpc,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/e2e-baremetalds + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-installer-master-e2e-baremetalds + optional: true + rerun_command: /test e2e-baremetalds + skip_report: true + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --branch=master + - --give-pr-author-access-to-namespace=true + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org + - --org=openshift + - --repo=installer + - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org + - --secret-dir=/usr/local/e2e-baremetalds-cluster-profile + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=e2e-baremetalds + command: + - ci-operator + env: + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: openshift-installer-master.yaml + name: ci-operator-master-configs + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-baremetalds-cluster-profile + name: cluster-profile + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/sentry-dsn + name: sentry-dsn + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-aws + - name: pull-secret + secret: + secretName: regcred + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: (?m)^/test( | .* )e2e-baremetalds,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -2857,90 +2944,3 @@ presubmits: requests: cpu: 500m trigger: (?m)^/test yaml-lint - - agent: kubernetes - always_run: true - branches: - - master - context: ci/prow/e2e-baremetalds - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/prowgen-controlled: "true" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-installer-master-e2e-baremetalds - optional: true - rerun_command: /test e2e-baremetalds - skip_report: true - spec: - containers: - - args: - - --artifact-dir=$(ARTIFACTS) - - --branch=master - - --give-pr-author-access-to-namespace=true - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --kubeconfig=/etc/apici/kubeconfig - - --lease-server-password-file=/etc/boskos/password - - --lease-server-username=ci - - --lease-server=https://boskos-ci.svc.ci.openshift.org - - --org=openshift - - --repo=installer - - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org - - --secret-dir=/usr/local/e2e-baremetalds-cluster-profile - - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-baremetalds - command: - - ci-operator - env: - - name: CONFIG_SPEC - valueFrom: - configMapKeyRef: - key: openshift-installer-master.yaml - name: ci-operator-master-configs - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/apici - name: apici-ci-operator-credentials - readOnly: true - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/e2e-baremetalds-cluster-profile - name: cluster-profile - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/sentry-dsn - name: sentry-dsn - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: apici-ci-operator-credentials - secret: - items: - - key: sa.ci-operator.apici.config - path: kubeconfig - secretName: apici-ci-operator-credentials - - name: boskos - secret: - items: - - key: password - path: password - secretName: boskos-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-aws - - name: pull-secret - secret: - secretName: regcred - - name: sentry-dsn - secret: - secretName: sentry-dsn - trigger: (?m)^/test( | .* )e2e-baremetalds,?($|\s.*) From 8eecd6b5e9348025e80d24735a4e639a1f9d83b3 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 26 Feb 2020 15:59:47 +0100 Subject: [PATCH 007/100] Job definition fix --- .../installer/openshift-installer-master-presubmits.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml index d5667bcbd9779..004fa7839a0c0 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml @@ -1202,7 +1202,9 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-aws + name: cluster-secrets-packet + - configMap: + name: cluster-profile-packet - name: pull-secret secret: secretName: regcred From bcb6213a955ce04c320418949b7a1aa5f387441e Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 26 Feb 2020 16:35:31 +0100 Subject: [PATCH 008/100] Adding preliminary step for nss-wrapper-hack --- .../baremetalds/e2e/baremetalds-e2e-workflow.yaml | 5 ++--- ci-operator/step-registry/baremetalds/nss/OWNERS | 5 +++++ .../step-registry/baremetalds/nss/wrapper/OWNERS | 5 +++++ .../baremetalds/nss/wrapper/hack/OWNERS | 5 +++++ .../nss/wrapper/hack/nss-wrapper-hack-commands.sh | 12 ++++++++++++ .../nss/wrapper/hack/nss-wrapper-hack-ref.yaml | 10 ++++++++++ 6 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 ci-operator/step-registry/baremetalds/nss/OWNERS create mode 100644 ci-operator/step-registry/baremetalds/nss/wrapper/OWNERS create mode 100644 ci-operator/step-registry/baremetalds/nss/wrapper/hack/OWNERS create mode 100755 ci-operator/step-registry/baremetalds/nss/wrapper/hack/nss-wrapper-hack-commands.sh create mode 100644 ci-operator/step-registry/baremetalds/nss/wrapper/hack/nss-wrapper-hack-ref.yaml diff --git a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml index 5216ae65323c1..920f9b161e6b4 100644 --- a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml +++ b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml @@ -1,9 +1,8 @@ workflow: as: baremetalds-e2e steps: - #pre: - #- ref: ipi-conf - #- chain: ipi-install + pre: + - ref: baremetalds-nss-wrapper-hack test: - ref: baremetalds-e2e-test #post: diff --git a/ci-operator/step-registry/baremetalds/nss/OWNERS b/ci-operator/step-registry/baremetalds/nss/OWNERS new file mode 100644 index 0000000000000..3ba207e71e301 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/nss/OWNERS @@ -0,0 +1,5 @@ +approvers: +- andfasano +- akiselev1 +- derekhiggins +- honza diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/OWNERS b/ci-operator/step-registry/baremetalds/nss/wrapper/OWNERS new file mode 100644 index 0000000000000..3ba207e71e301 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/OWNERS @@ -0,0 +1,5 @@ +approvers: +- andfasano +- akiselev1 +- derekhiggins +- honza diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/OWNERS b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/OWNERS new file mode 100644 index 0000000000000..3ba207e71e301 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/OWNERS @@ -0,0 +1,5 @@ +approvers: +- andfasano +- akiselev1 +- derekhiggins +- honza diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/nss-wrapper-hack-commands.sh new file mode 100755 index 0000000000000..df1be0de38196 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/nss-wrapper-hack-commands.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +set -o nounset +set -o errexit +set -o pipefail + +echo "Copying nss artifacts to ${SHARED_DIR}" +cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${SHARED_DIR} + + + + diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/nss-wrapper-hack-ref.yaml b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/nss-wrapper-hack-ref.yaml new file mode 100644 index 0000000000000..4b9090a9cfec9 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/nss-wrapper-hack-ref.yaml @@ -0,0 +1,10 @@ +ref: + as: nss-wrapper-hack + from: stable:libvirt-installer + commands: nss-wrapper-hack-commands.sh + resources: + requests: + cpu: 1000m + memory: 100Mi + documentation: |- + This step is required since libnns_wrapper is needed to use ssh in packet server From 9be7f10a72ec5c909028ced8f2f2ad7526aec452 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 26 Feb 2020 16:55:14 +0100 Subject: [PATCH 009/100] Renaming registry steps --- ...k-commands.sh => baremetalds-nss-wrapper-hack-commands.sh} | 0 ...er-hack-ref.yaml => baremetalds-nss-wrapper-hack-ref.yaml} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename ci-operator/step-registry/baremetalds/nss/wrapper/hack/{nss-wrapper-hack-commands.sh => baremetalds-nss-wrapper-hack-commands.sh} (100%) rename ci-operator/step-registry/baremetalds/nss/wrapper/hack/{nss-wrapper-hack-ref.yaml => baremetalds-nss-wrapper-hack-ref.yaml} (70%) diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh similarity index 100% rename from ci-operator/step-registry/baremetalds/nss/wrapper/hack/nss-wrapper-hack-commands.sh rename to ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/nss-wrapper-hack-ref.yaml b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-ref.yaml similarity index 70% rename from ci-operator/step-registry/baremetalds/nss/wrapper/hack/nss-wrapper-hack-ref.yaml rename to ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-ref.yaml index 4b9090a9cfec9..5d4347245af02 100644 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/nss-wrapper-hack-ref.yaml +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-ref.yaml @@ -1,7 +1,7 @@ ref: - as: nss-wrapper-hack + as: baremetalds-nss-wrapper-hack from: stable:libvirt-installer - commands: nss-wrapper-hack-commands.sh + commands: baremetalds-nss-wrapper-hack-commands.sh resources: requests: cpu: 1000m From 1491d9b5501557ee77b5bcc16e597666e7b4ad74 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 26 Feb 2020 19:41:11 +0100 Subject: [PATCH 010/100] Modifying secrets (from metal) --- .../installer/openshift-installer-master-presubmits.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml index 004fa7839a0c0..a56362637d1a1 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml @@ -1202,9 +1202,7 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-packet - - configMap: - name: cluster-profile-packet + name: cluster-secrets-metal - name: pull-secret secret: secretName: regcred From a0f962be9bb11211f4764e749b1a248b0cbad221 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 27 Feb 2020 10:53:51 +0100 Subject: [PATCH 011/100] shared dir test --- .../e2e/baremetalds-e2e-workflow.yaml | 1 + .../baremetalds-nss-wrapper-hack-commands.sh | 9 +++++++-- .../step-registry/baremetalds/setup/OWNERS | 5 +++++ .../setup/baremetalds-setup-commands.sh | 16 ++++++++++++++++ .../baremetalds/setup/baremetalds-setup-ref.yaml | 10 ++++++++++ 5 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 ci-operator/step-registry/baremetalds/setup/OWNERS create mode 100644 ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh create mode 100644 ci-operator/step-registry/baremetalds/setup/baremetalds-setup-ref.yaml diff --git a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml index 920f9b161e6b4..af5c24b96614f 100644 --- a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml +++ b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml @@ -3,6 +3,7 @@ workflow: steps: pre: - ref: baremetalds-nss-wrapper-hack + - ref: baremetalds-setup test: - ref: baremetalds-e2e-test #post: diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh index df1be0de38196..957753ce9528e 100755 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh @@ -4,8 +4,13 @@ set -o nounset set -o errexit set -o pipefail -echo "Copying nss artifacts to ${SHARED_DIR}" -cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${SHARED_DIR} +env + +dir=/tmp/shared +mkdir "${dir}/" + +echo "Copying nss artifacts to ${DIR}" +cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${DIR} diff --git a/ci-operator/step-registry/baremetalds/setup/OWNERS b/ci-operator/step-registry/baremetalds/setup/OWNERS new file mode 100644 index 0000000000000..3ba207e71e301 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/setup/OWNERS @@ -0,0 +1,5 @@ +approvers: +- andfasano +- akiselev1 +- derekhiggins +- honza diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh new file mode 100644 index 0000000000000..9b209fea66a02 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +set -o nounset +set -o errexit +set -o pipefail + +env + +dir=/tmp/shared + +echo "Copying nss artifacts from ${DIR}" +ls ${DIR} + + + + diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-ref.yaml b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-ref.yaml new file mode 100644 index 0000000000000..287723c546448 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-ref.yaml @@ -0,0 +1,10 @@ +ref: + as: baremetalds-setup + from: stable:upi-installer + commands: baremetalds-setup-commands.sh + resources: + requests: + cpu: 1000m + memory: 500Mi + documentation: |- + This step performs the setup of the packet server that will host and execute dev-scripts From f3bd693852176061afd83f38e12bce62cfb2af25 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 27 Feb 2020 11:03:27 +0100 Subject: [PATCH 012/100] Shell check fix --- .../nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh | 4 ++-- .../baremetalds/setup/baremetalds-setup-commands.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh index 957753ce9528e..300b732286268 100755 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh @@ -9,8 +9,8 @@ env dir=/tmp/shared mkdir "${dir}/" -echo "Copying nss artifacts to ${DIR}" -cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${DIR} +echo "Copying nss artifacts to ${dir}" +cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${dir} diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 9b209fea66a02..51d78083ce0dd 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -8,8 +8,8 @@ env dir=/tmp/shared -echo "Copying nss artifacts from ${DIR}" -ls ${DIR} +echo "Copying nss artifacts from ${dir}" +ls -ll ${dir} From 5a5e2766dfd4410fd09f6021b25014da4630eab6 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 27 Feb 2020 11:43:26 +0100 Subject: [PATCH 013/100] Another test on shared dir --- .../baremetalds/setup/baremetalds-setup-commands.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 51d78083ce0dd..291f553bb0ddb 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -4,13 +4,14 @@ set -o nounset set -o errexit set -o pipefail +echo "************ setup command ************" env -dir=/tmp/shared - -echo "Copying nss artifacts from ${dir}" -ls -ll ${dir} +echo "------------ /tmp" +ls -ll /tmp +echo "------------ /tmp/cluster" +ls -ll /tmp/cluster From dfe285a379b8af10ce4e9db01493d475526dea4f Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 27 Feb 2020 11:44:10 +0100 Subject: [PATCH 014/100] Added label --- .../nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh index 300b732286268..1a7b38f16df72 100755 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh @@ -4,6 +4,7 @@ set -o nounset set -o errexit set -o pipefail +echo "************ nss wrapper hack command "************ env dir=/tmp/shared From 2c8ddddc9fb3a31be6f3d49f0fa3768eeb61a4e2 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 27 Feb 2020 12:42:55 +0100 Subject: [PATCH 015/100] Another test --- .../baremetalds/setup/baremetalds-setup-commands.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 291f553bb0ddb..96d96ab9c4441 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -7,11 +7,18 @@ set -o pipefail echo "************ setup command ************" env +echo "" echo "------------ /tmp" ls -ll /tmp -echo "------------ /tmp/cluster" -ls -ll /tmp/cluster +echo "" +echo "------------ /tmp/secret-wrapper" +ls -ll /tmp/secret-wrapper + +echo "" +echo "------------ ${SHARED_DIR}" +ls -ll ${SHARED_DIR} + From f13925eb3a2b349e85e05a5351ef66d83a9b49bb Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 27 Feb 2020 12:48:48 +0100 Subject: [PATCH 016/100] Another test on mounted paths --- .../baremetalds/setup/baremetalds-setup-commands.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 96d96ab9c4441..213f61029670d 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -19,6 +19,14 @@ echo "" echo "------------ ${SHARED_DIR}" ls -ll ${SHARED_DIR} +echo "" +echo "------------ /usr/local" +ls -ll /usr/local + +echo "" +echo "------------ /usr/local/e2e-baremetalds-cluster-profile" +ls -ll /usr/local/e2e-baremetalds-cluster-profile + From beae102886a73100427b3d47b2c0cfe5f163ce4f Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 27 Feb 2020 15:13:41 +0100 Subject: [PATCH 017/100] Test for shared dir (and profile) --- .../installer/openshift-installer-master.yaml | 2 +- .../baremetalds-nss-wrapper-hack-commands.sh | 12 ++++++++++-- .../setup/baremetalds-setup-commands.sh | 17 +++-------------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml index a4e402be14fa0..98a6d77c0167d 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml @@ -202,5 +202,5 @@ tests: - as: e2e-baremetalds commands: "" steps: - cluster_profile: packet + cluster_profile: metal workflow: baremetalds-e2e \ No newline at end of file diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh index 1a7b38f16df72..52d8002e9e8ff 100755 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh @@ -7,12 +7,20 @@ set -o pipefail echo "************ nss wrapper hack command "************ env -dir=/tmp/shared -mkdir "${dir}/" +dir=/tmp/secret echo "Copying nss artifacts to ${dir}" cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${dir} +echo "" +echo "------------ /${SHARED_DIR}" +ls -ll ${SHARED_DIR} + +echo "" +echo "------------ /tmp/secret" +ls -ll /tmp/secret + + diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 213f61029670d..9e804b3b96ed3 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -8,24 +8,13 @@ echo "************ setup command ************" env echo "" -echo "------------ /tmp" -ls -ll /tmp - -echo "" -echo "------------ /tmp/secret-wrapper" -ls -ll /tmp/secret-wrapper - -echo "" -echo "------------ ${SHARED_DIR}" +echo "------------ /${SHARED_DIR}" ls -ll ${SHARED_DIR} echo "" -echo "------------ /usr/local" -ls -ll /usr/local +echo "------------ /tmp/secret" +ls -ll /tmp/secret -echo "" -echo "------------ /usr/local/e2e-baremetalds-cluster-profile" -ls -ll /usr/local/e2e-baremetalds-cluster-profile From 316a862ff04a61a8f7e90ed395defb9068ba562e Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 27 Feb 2020 16:00:11 +0100 Subject: [PATCH 018/100] Setting cluster_type back to packet --- .../config/openshift/installer/openshift-installer-master.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml index 98a6d77c0167d..a4e402be14fa0 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml @@ -202,5 +202,5 @@ tests: - as: e2e-baremetalds commands: "" steps: - cluster_profile: metal + cluster_profile: packet workflow: baremetalds-e2e \ No newline at end of file From c68839f4fa8276f87fb370c5c8899d2ae8d931da Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 27 Feb 2020 17:47:12 +0100 Subject: [PATCH 019/100] Testing /tmp/secret --- .../hack/baremetalds-nss-wrapper-hack-commands.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh index 52d8002e9e8ff..239da21b3081f 100755 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh @@ -9,6 +9,15 @@ env dir=/tmp/secret +echo "" +echo "------------ /tmp" +ls -ll tmp + +if [ ! -d ${dir} ]; then + echo "Making ${dir}" + mkdir ${dir} + fi + echo "Copying nss artifacts to ${dir}" cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${dir} From 089026691acb1feb603ed487baa4b33ff7e48dd5 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 27 Feb 2020 18:10:18 +0100 Subject: [PATCH 020/100] Remove tmp check --- .../wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh index 239da21b3081f..80ff4b91ae585 100755 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh @@ -9,14 +9,10 @@ env dir=/tmp/secret -echo "" -echo "------------ /tmp" -ls -ll tmp - if [ ! -d ${dir} ]; then echo "Making ${dir}" - mkdir ${dir} - fi + mkdir -p ${dir} +fi echo "Copying nss artifacts to ${dir}" cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${dir} From 4c1934905f3722a00fbc183c674fbb79314ff0db Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 27 Feb 2020 18:54:18 +0100 Subject: [PATCH 021/100] Showing content of the cluster profile --- .../baremetalds/setup/baremetalds-setup-commands.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 9e804b3b96ed3..7155f48cde35d 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -12,8 +12,8 @@ echo "------------ /${SHARED_DIR}" ls -ll ${SHARED_DIR} echo "" -echo "------------ /tmp/secret" -ls -ll /tmp/secret +echo "------------ /var/run/secrets/ci.openshift.io/cluster-profile" +ls -ll /var/run/secrets/ci.openshift.io/cluster-profile From 32e7c535a0c1a9e0d4cac842732d28572f1a4466 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 27 Feb 2020 21:56:10 +0100 Subject: [PATCH 022/100] Showing hidden files also --- .../baremetalds/setup/baremetalds-setup-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 7155f48cde35d..ebf9393654cb7 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -13,7 +13,7 @@ ls -ll ${SHARED_DIR} echo "" echo "------------ /var/run/secrets/ci.openshift.io/cluster-profile" -ls -ll /var/run/secrets/ci.openshift.io/cluster-profile +ls -la /var/run/secrets/ci.openshift.io/cluster-profile From b8fd6ef2fe3d79394de7ef8672c192e5496de375 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 28 Feb 2020 09:20:12 +0100 Subject: [PATCH 023/100] Testing CLUSTER_TYPE --- .../baremetalds/setup/baremetalds-setup-commands.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index ebf9393654cb7..2fd3aeb970606 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -7,6 +7,9 @@ set -o pipefail echo "************ setup command ************" env +echo " +echo "CLUSTER_TYPE=${CLUSTER_TYPE}"" + echo "" echo "------------ /${SHARED_DIR}" ls -ll ${SHARED_DIR} From ca3e25062a74be59910cda4d0b075fa160d51538 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 28 Feb 2020 10:53:07 +0100 Subject: [PATCH 024/100] Artifact dir check --- .../e2e/baremetalds-e2e-workflow.yaml | 6 +- .../e2e/test/baremetalds-e2e-test-commands.sh | 11 +- .../baremetalds-nss-wrapper-hack-commands.sh | 22 ++- .../setup/baremetalds-setup-commands.sh | 126 ++++++++++++++++-- .../step-registry/baremetalds/teardown/OWNERS | 5 + .../teardown/baremetalds-teardown-commands.sh | 41 ++++++ .../teardown/baremetalds-teardown-ref.yaml | 10 ++ 7 files changed, 196 insertions(+), 25 deletions(-) create mode 100644 ci-operator/step-registry/baremetalds/teardown/OWNERS create mode 100644 ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh create mode 100644 ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-ref.yaml diff --git a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml index af5c24b96614f..9e1a6ef102fa9 100644 --- a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml +++ b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml @@ -6,7 +6,7 @@ workflow: - ref: baremetalds-setup test: - ref: baremetalds-e2e-test - #post: - #- chain: ipi-deprovision + post: + - ref: baremetalds-teardown documentation: |- - The Baremetal DS E2E workflow executes the common end-to-end test suite. + The Baremetal DS E2E workflow executes the common end-to-end test suite on a cluster provisioned by running dev-scripts on a packet server. diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 8ce5fae3af1ab..850437c6da6ef 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -4,7 +4,16 @@ set -o nounset set -o errexit set -o pipefail -echo "Baremetal DS test commands executed" +echo "************ baremetalds test command ************" +env | sort + +# Initial check +if [ "${CLUSTER_TYPE}" != "packet" ] ; then + echo >&2 "Unsupported cluster type '${CLUSTER_TYPE}'" + exit 0 +fi + +echo "Executing baremetal ds conformance tests" #test_suite=openshift/conformance/parallel #if [[ -e "${SHARED_DIR}/test-suite.txt" ]]; then diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh index 80ff4b91ae585..0f8ea83dcde12 100755 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh @@ -4,28 +4,26 @@ set -o nounset set -o errexit set -o pipefail -echo "************ nss wrapper hack command "************ -env +echo "************ baremetalds nss wrapper hack command "************ +env | sort + +# Initial check +if [ "${CLUSTER_TYPE}" != "packet" ] ; then + echo >&2 "Unsupported cluster type '${CLUSTER_TYPE}'" + exit 0 +fi dir=/tmp/secret if [ ! -d ${dir} ]; then - echo "Making ${dir}" mkdir -p ${dir} fi echo "Copying nss artifacts to ${dir}" cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${dir} -echo "" -echo "------------ /${SHARED_DIR}" -ls -ll ${SHARED_DIR} - -echo "" -echo "------------ /tmp/secret" -ls -ll /tmp/secret - - +echo "Testing artifacts dir" +cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${ARTIFACT_DIR} diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 2fd3aeb970606..34a4bf9a07927 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -4,20 +4,128 @@ set -o nounset set -o errexit set -o pipefail -echo "************ setup command ************" -env +cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile +secret_dir=/tmp/secret -echo " -echo "CLUSTER_TYPE=${CLUSTER_TYPE}"" +export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey +export PULL_SECRET_PATH=${cluster_profile}/pull-secret +export PACKET_AUTH_TOKEN=${cluster_profile}/.packetcrd +export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${RELEASE_IMAGE_LATEST} +export PACKET_PROJECT_ID=b3c1623c-ce0b-45cf-9757-c61a71e06eac +export CLUSTER_NAME=${NAMESPACE}-${JOB_NAME_HASH} -echo "" -echo "------------ /${SHARED_DIR}" -ls -ll ${SHARED_DIR} +echo "************ baremetalds setup command ************" +env | sort + +# Initial check +if [ "${CLUSTER_TYPE}" != "packet" ] ; then + echo >&2 "Unsupported cluster type '${CLUSTER_TYPE}'" + exit 0 +fi echo "" -echo "------------ /var/run/secrets/ci.openshift.io/cluster-profile" -ls -la /var/run/secrets/ci.openshift.io/cluster-profile +echo "------------ /${ARTIFACT_DIR}" +ls -ll ${ARTIFACT_DIR} + +# echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" + +# # Terraform setup and init for packet server +# terraform_home=${ARTIFACT_DIR}/terraform +# mkdir -p ${terraform_home} +# cd ${terraform_home} + +# cat > ${terraform_home}/terraform.tf <<-EOF +# provider "packet" { +# } + +# resource "packet_device" "server" { +# count = "1" +# project_id = "$PACKET_PROJECT_ID" +# hostname = "ipi-$CLUSTER_NAME" +# plan = "m2.xlarge.x86" +# facilities = ["sjc1", "ewr1"] +# operating_system = "centos_7" +# billing_cycle = "hourly" +# } +# EOF + +# terraform init + +# # Packet returns transients errors when creating devices. +# # example, `Oh snap, something went wrong! We've logged the error and will take a look - please reach out to us if you continue having trouble.` +# # therefore the terraform apply needs to be retried a few time before giving up. +# rc=1 +# for r in {1..5}; do terraform apply -auto-approve && rc=0 && break ; done +# if test "${rc}" -eq 1; then echo "failed to create the infra resources"; sleep 1; fi + +# jq -r '.modules[0].resources["packet_device.server"].primary.attributes.access_public_ipv4' terraform.tfstate > ${secret_dir}/packet-server-ip + +# export HOME=${secret_dir}/nss_wrapper +# mkdir -p $HOME + +# # Note: libnss_wrapper.so and mock-nss.sh are relative to SHARED_DIR because they've been copied by the previous nss-wrapper-hack step +# export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${SHARED_DIR}/libnss_wrapper.so +# bash ${SHARED_DIR}/mock-nss.sh + +# SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${SSH_PRIV_KEY_PATH}" +# export IP=$(cat ${secret_dir}/packet-server-ip) + +# echo "Packet server IP is ${IP}" + +######### + +# for x in $(seq 10) ; do +# test $x == 10 && exit 1 +# ssh $SSHOPTS root@$IP hostname && break +# sleep 10 +# done + +# scp $SSHOPTS ${PULL_SECRET_PATH} root@$IP:pull-secret +# timeout -s 9 175m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g' + +# set -ex + +# yum install -y git + +# # python2-cryptography needs to come from delorean-master-testing, priority of packet.repo overrides it +# # remove the priority and instead ensure the packet repo is named first alphabetically +# # this way it is prefered but it isn't a hard override when newer versions are found elsewhere +# sed -i -e 's/priority.*//g' /etc/yum.repos.d/packet.repo +# sed -i -e 's/packet-/a_packet-/g' /etc/yum.repos.d/packet.repo + +# rm -rf /tmp/artifacts +# mkdir -p /tmp/artifacts + +# if [ ! -e dev-scripts ] ; then +# git clone https://github.com/openshift-metal3/dev-scripts.git +# fi +# cd dev-scripts + +# set +x +# echo "export PULL_SECRET='\$(cat /root/pull-secret)'" > /root/dev-scripts/config_root.sh +# set -x + +# curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - + +# #echo "export OPENSHIFT_RELEASE_IMAGE=$MIRROR_BASE:latest" >> /root/dev-scripts/config_root.sh +# echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-01-29-012724" >> /root/dev-scripts/config_root.sh +# echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh +# echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh +# echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh + +# echo 'export KUBECONFIG=/root/dev-scripts/ocp/auth/kubeconfig' >> /root/.bashrc + +# if [ ! -e /opt/dev-scripts/pool ] ; then +# mkdir -p /opt/dev-scripts/pool +# mount -t tmpfs -o size=100G tmpfs /opt/dev-scripts/pool +# fi + +# timeout -s 9 105m make + +# EOF +# mkdir -p ${ARTIFACT_DIR}/installer/auth +# scp $SSHOPTS root@$IP:./dev-scripts/ocp/auth/kubeconfig ${ARTIFACT_DIR}/installer/auth/kubeconfig diff --git a/ci-operator/step-registry/baremetalds/teardown/OWNERS b/ci-operator/step-registry/baremetalds/teardown/OWNERS new file mode 100644 index 0000000000000..3ba207e71e301 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/teardown/OWNERS @@ -0,0 +1,5 @@ +approvers: +- andfasano +- akiselev1 +- derekhiggins +- honza diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh new file mode 100644 index 0000000000000..758f7c7ac0b86 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +set -o nounset +set -o errexit +set -o pipefail + +cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile +export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey +export PACKETCRD_PATH=${cluster_profile}/.packetcrd +export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${RELEASE_IMAGE_LATEST} + +echo "************ baremetalds teardown command ************" +env | sort + +# Initial check +if [ "${CLUSTER_TYPE}" != "packet" ] ; then + echo >&2 "Unsupported cluster type '${CLUSTER_TYPE}'" + exit 0 +fi + +# finished() +# { +# set +e +# +# if [ -n "$IP" ] ; then +# echo "Getting logs" +# ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C /tmp/artifacts -xzf - +# sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' /tmp/artifacts/root/dev-scripts/logs/* +# fi +# +# echo "Deprovisioning cluster ..." +# cd /tmp/artifacts/terraform +# terraform init +# for r in {1..5}; do terraform destroy -auto-approve && break ; done +# touch /tmp/shared/exit +# } +# trap finished EXIT TERM + + + + diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-ref.yaml b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-ref.yaml new file mode 100644 index 0000000000000..16bb40dc6620e --- /dev/null +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-ref.yaml @@ -0,0 +1,10 @@ +ref: + as: baremetalds-teardown + from: stable:tests + commands: baremetalds-teardown-commands.sh + resources: + requests: + cpu: 1000m + memory: 500Mi + documentation: |- + This step deprovisions the packet server From d3dfe4664d97e770f69b419a533b9520f549d3e2 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 28 Feb 2020 11:01:28 +0100 Subject: [PATCH 025/100] Temp fix for registry shellcheck --- .../baremetalds/setup/baremetalds-setup-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 34a4bf9a07927..b6a6d16ab9fee 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -5,7 +5,7 @@ set -o errexit set -o pipefail cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile -secret_dir=/tmp/secret +### secret_dir=/tmp/secret export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey export PULL_SECRET_PATH=${cluster_profile}/pull-secret From 2f28caca57a7e40342f259a6edca95f24b4b1b30 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 28 Feb 2020 12:06:08 +0100 Subject: [PATCH 026/100] Adding terraform setup and teardown --- .../baremetalds-nss-wrapper-hack-commands.sh | 2 - .../setup/baremetalds-setup-commands.sh | 83 +++++++++---------- .../teardown/baremetalds-teardown-commands.sh | 24 +++--- 3 files changed, 51 insertions(+), 58 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh index 0f8ea83dcde12..5faec9c629546 100755 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh @@ -22,8 +22,6 @@ fi echo "Copying nss artifacts to ${dir}" cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${dir} -echo "Testing artifacts dir" -cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${ARTIFACT_DIR} diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index b6a6d16ab9fee..59b210a299629 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -5,7 +5,7 @@ set -o errexit set -o pipefail cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile -### secret_dir=/tmp/secret +secret_dir=/tmp/secret export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey export PULL_SECRET_PATH=${cluster_profile}/pull-secret @@ -13,6 +13,7 @@ export PACKET_AUTH_TOKEN=${cluster_profile}/.packetcrd export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${RELEASE_IMAGE_LATEST} export PACKET_PROJECT_ID=b3c1623c-ce0b-45cf-9757-c61a71e06eac export CLUSTER_NAME=${NAMESPACE}-${JOB_NAME_HASH} +export SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${SSH_PRIV_KEY_PATH}" echo "************ baremetalds setup command ************" env | sort @@ -23,54 +24,52 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 0 fi -echo "" -echo "------------ /${ARTIFACT_DIR}" -ls -ll ${ARTIFACT_DIR} - -# echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" - -# # Terraform setup and init for packet server -# terraform_home=${ARTIFACT_DIR}/terraform -# mkdir -p ${terraform_home} -# cd ${terraform_home} - -# cat > ${terraform_home}/terraform.tf <<-EOF -# provider "packet" { -# } - -# resource "packet_device" "server" { -# count = "1" -# project_id = "$PACKET_PROJECT_ID" -# hostname = "ipi-$CLUSTER_NAME" -# plan = "m2.xlarge.x86" -# facilities = ["sjc1", "ewr1"] -# operating_system = "centos_7" -# billing_cycle = "hourly" -# } -# EOF +echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" + +# Terraform setup and init for packet server +terraform_home=${ARTIFACT_DIR}/terraform +mkdir -p ${terraform_home} +cd ${terraform_home} + +cat > ${terraform_home}/terraform.tf <<-EOF +provider "packet" { +} + +resource "packet_device" "server" { + count = "1" + project_id = "$PACKET_PROJECT_ID" + hostname = "ipi-$CLUSTER_NAME" + plan = "m2.xlarge.x86" + facilities = ["sjc1", "ewr1"] + operating_system = "centos_7" + billing_cycle = "hourly" +} +EOF -# terraform init +terraform init -# # Packet returns transients errors when creating devices. -# # example, `Oh snap, something went wrong! We've logged the error and will take a look - please reach out to us if you continue having trouble.` -# # therefore the terraform apply needs to be retried a few time before giving up. -# rc=1 -# for r in {1..5}; do terraform apply -auto-approve && rc=0 && break ; done -# if test "${rc}" -eq 1; then echo "failed to create the infra resources"; sleep 1; fi +# Packet returns transients errors when creating devices. +# example, `Oh snap, something went wrong! We've logged the error and will take a look - please reach out to us if you continue having trouble.` +# therefore the terraform apply needs to be retried a few time before giving up. +rc=1 +for r in {1..5}; do terraform apply -auto-approve && rc=0 && break ; done +if test "${rc}" -eq 1; then echo "failed to create the infra resources"; sleep 1; fi -# jq -r '.modules[0].resources["packet_device.server"].primary.attributes.access_public_ipv4' terraform.tfstate > ${secret_dir}/packet-server-ip +# Sharing artifacts required by teardown +jq -r '.modules[0].resources["packet_device.server"].primary.attributes.access_public_ipv4' terraform.tfstate > ${secret_dir}/packet-server-ip -# export HOME=${secret_dir}/nss_wrapper -# mkdir -p $HOME +export HOME=${secret_dir}/nss_wrapper +mkdir -p $HOME -# # Note: libnss_wrapper.so and mock-nss.sh are relative to SHARED_DIR because they've been copied by the previous nss-wrapper-hack step -# export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${SHARED_DIR}/libnss_wrapper.so -# bash ${SHARED_DIR}/mock-nss.sh +# Note: libnss_wrapper.so and mock-nss.sh are relative to SHARED_DIR because they've been copied by the previous nss-wrapper-hack step +export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${SHARED_DIR}/libnss_wrapper.so +bash ${SHARED_DIR}/mock-nss.sh -# SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${SSH_PRIV_KEY_PATH}" -# export IP=$(cat ${secret_dir}/packet-server-ip) +export IP=$(cat ${secret_dir}/packet-server-ip) +echo "Packet server IP is ${IP}" -# echo "Packet server IP is ${IP}" +# Sharing terraform artifacts required by teardown +cp -R ${terraform_home} ${secret_dir} ######### diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 758f7c7ac0b86..0c04e9216aa25 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -6,8 +6,7 @@ set -o pipefail cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey -export PACKETCRD_PATH=${cluster_profile}/.packetcrd -export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${RELEASE_IMAGE_LATEST} +export SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${SSH_PRIV_KEY_PATH}" echo "************ baremetalds teardown command ************" env | sort @@ -18,24 +17,21 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 0 fi -# finished() -# { -# set +e -# +# Terraform setup and teardown for packet server +terraform_home=${ARTIFACT_DIR}/terraform +cp -R ${SHARED_DIR}/terraform ${ARTIFACT_DIR} # Retrieving shared terraform configuration +cd ${terraform_home} + + # if [ -n "$IP" ] ; then # echo "Getting logs" # ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C /tmp/artifacts -xzf - # sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' /tmp/artifacts/root/dev-scripts/logs/* # fi -# -# echo "Deprovisioning cluster ..." -# cd /tmp/artifacts/terraform -# terraform init -# for r in {1..5}; do terraform destroy -auto-approve && break ; done -# touch /tmp/shared/exit -# } -# trap finished EXIT TERM +echo "Deprovisioning cluster ..." +terraform init +for r in {1..5}; do terraform destroy -auto-approve && break ; done From aa908c145608ac6cb1983314f83e328005798245 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 28 Feb 2020 12:59:19 +0100 Subject: [PATCH 027/100] Fixing packet token issue --- .../baremetalds/setup/baremetalds-setup-commands.sh | 7 +++++-- .../teardown/baremetalds-teardown-commands.sh | 11 ++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 59b210a299629..610f0188269f5 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -9,12 +9,15 @@ secret_dir=/tmp/secret export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey export PULL_SECRET_PATH=${cluster_profile}/pull-secret -export PACKET_AUTH_TOKEN=${cluster_profile}/.packetcrd export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${RELEASE_IMAGE_LATEST} -export PACKET_PROJECT_ID=b3c1623c-ce0b-45cf-9757-c61a71e06eac export CLUSTER_NAME=${NAMESPACE}-${JOB_NAME_HASH} export SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${SSH_PRIV_KEY_PATH}" +set +x +export PACKET_PROJECT_ID=b3c1623c-ce0b-45cf-9757-c61a71e06eac +export PACKET_AUTH_TOKEN=$(cat ${cluster_profile}/.packetcred) +set -x + echo "************ baremetalds setup command ************" env | sort diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 0c04e9216aa25..4f070b32b05e1 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -6,7 +6,10 @@ set -o pipefail cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey + +set +x export SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${SSH_PRIV_KEY_PATH}" +set -x echo "************ baremetalds teardown command ************" env | sort @@ -14,11 +17,17 @@ env | sort # Initial check if [ "${CLUSTER_TYPE}" != "packet" ] ; then echo >&2 "Unsupported cluster type '${CLUSTER_TYPE}'" - exit 0 + exit 1 fi # Terraform setup and teardown for packet server terraform_home=${ARTIFACT_DIR}/terraform + +if [ ! -d ${terraform_home} ]; then + echo >&2 "Cannot teardown packet server, terraform config files are missing" + exit 1 +fi + cp -R ${SHARED_DIR}/terraform ${ARTIFACT_DIR} # Retrieving shared terraform configuration cd ${terraform_home} From e42ac942c337c73d7f389df81cf7588baa4f8d5b Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 28 Feb 2020 14:37:03 +0100 Subject: [PATCH 028/100] Fixing share of packet id --- .../baremetalds/setup/baremetalds-setup-commands.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 610f0188269f5..2da50cc467572 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -58,7 +58,11 @@ rc=1 for r in {1..5}; do terraform apply -auto-approve && rc=0 && break ; done if test "${rc}" -eq 1; then echo "failed to create the infra resources"; sleep 1; fi +# Sharing terraform artifacts required by teardown +cp -R ${terraform_home} ${secret_dir} + # Sharing artifacts required by teardown +touch ${secret_dir}/packet-server-ip jq -r '.modules[0].resources["packet_device.server"].primary.attributes.access_public_ipv4' terraform.tfstate > ${secret_dir}/packet-server-ip export HOME=${secret_dir}/nss_wrapper @@ -71,9 +75,6 @@ bash ${SHARED_DIR}/mock-nss.sh export IP=$(cat ${secret_dir}/packet-server-ip) echo "Packet server IP is ${IP}" -# Sharing terraform artifacts required by teardown -cp -R ${terraform_home} ${secret_dir} - ######### # for x in $(seq 10) ; do From 2d0109b34f57bab3e6635d07723b8a193cd48719 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 28 Feb 2020 15:22:24 +0100 Subject: [PATCH 029/100] Fixing teardown and nss execution --- .../setup/baremetalds-setup-commands.sh | 15 +++++++++++---- .../teardown/baremetalds-teardown-commands.sh | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 2da50cc467572..a99bd2a89d53f 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -24,7 +24,7 @@ env | sort # Initial check if [ "${CLUSTER_TYPE}" != "packet" ] ; then echo >&2 "Unsupported cluster type '${CLUSTER_TYPE}'" - exit 0 + exit 1 fi echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" @@ -56,7 +56,10 @@ terraform init # therefore the terraform apply needs to be retried a few time before giving up. rc=1 for r in {1..5}; do terraform apply -auto-approve && rc=0 && break ; done -if test "${rc}" -eq 1; then echo "failed to create the infra resources"; sleep 1; fi +if test "${rc}" -eq 1; then + echo >&2 "Failed to create packet server" + exit 1 +fi # Sharing terraform artifacts required by teardown cp -R ${terraform_home} ${secret_dir} @@ -65,12 +68,16 @@ cp -R ${terraform_home} ${secret_dir} touch ${secret_dir}/packet-server-ip jq -r '.modules[0].resources["packet_device.server"].primary.attributes.access_public_ipv4' terraform.tfstate > ${secret_dir}/packet-server-ip +# NSS wrapper preparation +cp ${SHARED_DIR}/libnss_wrapper.so ${secret_dir} +cp ${SHARED_DIR}/mock-nss.sh ${secret_dir} + export HOME=${secret_dir}/nss_wrapper mkdir -p $HOME # Note: libnss_wrapper.so and mock-nss.sh are relative to SHARED_DIR because they've been copied by the previous nss-wrapper-hack step -export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${SHARED_DIR}/libnss_wrapper.so -bash ${SHARED_DIR}/mock-nss.sh +export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${secret_dir}/libnss_wrapper.so +bash ${secret_dir}/mock-nss.sh export IP=$(cat ${secret_dir}/packet-server-ip) echo "Packet server IP is ${IP}" diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 4f070b32b05e1..2ef534b893b0e 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -23,7 +23,7 @@ fi # Terraform setup and teardown for packet server terraform_home=${ARTIFACT_DIR}/terraform -if [ ! -d ${terraform_home} ]; then +if [ ! -d ${SHARED_DIR}/terraform ]; then echo >&2 "Cannot teardown packet server, terraform config files are missing" exit 1 fi From 92efa74694da5c2e1324f1a4d98d0948be942e57 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 28 Feb 2020 16:48:52 +0100 Subject: [PATCH 030/100] Refactoring logic for sharing terraform files between setup and teardown --- .../e2e/test/baremetalds-e2e-test-commands.sh | 2 ++ .../baremetalds-nss-wrapper-hack-commands.sh | 1 + .../setup/baremetalds-setup-commands.sh | 27 ++++++++++++------- .../teardown/baremetalds-teardown-commands.sh | 4 +++ 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 850437c6da6ef..e23aade878e7f 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -15,6 +15,8 @@ fi echo "Executing baremetal ds conformance tests" +ls -ll ${SHARED_DIR} + #test_suite=openshift/conformance/parallel #if [[ -e "${SHARED_DIR}/test-suite.txt" ]]; then # test_suite=$(<"${SHARED_DIR}/test-suite.txt") diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh index 5faec9c629546..f2c2e0c6d706c 100755 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh @@ -16,6 +16,7 @@ fi dir=/tmp/secret if [ ! -d ${dir} ]; then + echo "Making ${secret_dir}" mkdir -p ${dir} fi diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index a99bd2a89d53f..a6dc964555ece 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -62,25 +62,32 @@ if test "${rc}" -eq 1; then fi # Sharing terraform artifacts required by teardown -cp -R ${terraform_home} ${secret_dir} +if [ ! -d ${secret_dir} ]; then + echo "Making ${secret_dir}" + mkdir -p ${secret_dir} +fi + +mkdir -P ${secret_dir}/terraform +cp -R ${terraform_home}/terraform.* ${secret_dir}/terraform #Just copying the minimum files required to avoid size limits of /tmp/secrets +ls -ll ${secret_dir}/terraform # Sharing artifacts required by teardown touch ${secret_dir}/packet-server-ip jq -r '.modules[0].resources["packet_device.server"].primary.attributes.access_public_ipv4' terraform.tfstate > ${secret_dir}/packet-server-ip -# NSS wrapper preparation -cp ${SHARED_DIR}/libnss_wrapper.so ${secret_dir} -cp ${SHARED_DIR}/mock-nss.sh ${secret_dir} +# Fetch packet server IP +export IP=$(cat ${secret_dir}/packet-server-ip) +echo "Packet server IP is ${IP}" -export HOME=${secret_dir}/nss_wrapper +# NSS wrapper preparation +export HOME=/tmp/nss_wrapper mkdir -p $HOME -# Note: libnss_wrapper.so and mock-nss.sh are relative to SHARED_DIR because they've been copied by the previous nss-wrapper-hack step -export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${secret_dir}/libnss_wrapper.so -bash ${secret_dir}/mock-nss.sh +cp ${SHARED_DIR}/libnss_wrapper.so ${HOME} +cp ${SHARED_DIR}/mock-nss.sh ${HOME} -export IP=$(cat ${secret_dir}/packet-server-ip) -echo "Packet server IP is ${IP}" +export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so +bash ${HOME}/mock-nss.sh ######### diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 2ef534b893b0e..68101d9e0d66d 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -23,6 +23,8 @@ fi # Terraform setup and teardown for packet server terraform_home=${ARTIFACT_DIR}/terraform +ls -ll ${SHARED_DIR} + if [ ! -d ${SHARED_DIR}/terraform ]; then echo >&2 "Cannot teardown packet server, terraform config files are missing" exit 1 @@ -31,6 +33,8 @@ fi cp -R ${SHARED_DIR}/terraform ${ARTIFACT_DIR} # Retrieving shared terraform configuration cd ${terraform_home} +ls -ll + # if [ -n "$IP" ] ; then # echo "Getting logs" From 62d28d96f63705637a40e834b4ca8835f1f7117f Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 28 Feb 2020 21:42:37 +0100 Subject: [PATCH 031/100] Fixing nss wrapper typo --- .../wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh | 5 ++++- .../baremetalds/setup/baremetalds-setup-commands.sh | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh index f2c2e0c6d706c..5987d9b4a4d53 100755 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh @@ -16,13 +16,16 @@ fi dir=/tmp/secret if [ ! -d ${dir} ]; then - echo "Making ${secret_dir}" + echo "Making ${dir}" mkdir -p ${dir} fi echo "Copying nss artifacts to ${dir}" cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${dir} +echo "shared dir test"" +touch ${SHARED_DIR}/foo.txt + diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index a6dc964555ece..65a2abfcc4ba7 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -27,6 +27,10 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 1 fi +echo "-----------------------"" +ls -ll ${SHARED_DIR} +echo "-----------------------"" + echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" # Terraform setup and init for packet server From 0f68b6111ed4d49da09fc89b31d458b59dd06a0e Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 28 Feb 2020 22:11:32 +0100 Subject: [PATCH 032/100] Another typo fix --- .../nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh index 5987d9b4a4d53..6ca1d087ccc0a 100755 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh @@ -23,7 +23,7 @@ fi echo "Copying nss artifacts to ${dir}" cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${dir} -echo "shared dir test"" +echo "shared dir test" touch ${SHARED_DIR}/foo.txt From ac9c19cc803548d6b79090a7646b084c94cd2917 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 28 Feb 2020 23:10:59 +0100 Subject: [PATCH 033/100] Removing touch to SHARED_DIR --- .../nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh index 6ca1d087ccc0a..7bb4b651f8c10 100755 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh @@ -23,8 +23,6 @@ fi echo "Copying nss artifacts to ${dir}" cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${dir} -echo "shared dir test" -touch ${SHARED_DIR}/foo.txt From 38c864b94c1e6f5b68fd66ce6dd0cae19c52d868 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Mon, 2 Mar 2020 08:43:33 +0100 Subject: [PATCH 034/100] Another typo fix in terraform sharing --- .../baremetalds/setup/baremetalds-setup-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 65a2abfcc4ba7..a2fe54dd4de37 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -71,7 +71,7 @@ if [ ! -d ${secret_dir} ]; then mkdir -p ${secret_dir} fi -mkdir -P ${secret_dir}/terraform +mkdir -p ${secret_dir}/terraform cp -R ${terraform_home}/terraform.* ${secret_dir}/terraform #Just copying the minimum files required to avoid size limits of /tmp/secrets ls -ll ${secret_dir}/terraform From f7e447b108d123e372659cc4248ee8c55374ebb4 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Mon, 2 Mar 2020 09:28:47 +0100 Subject: [PATCH 035/100] New test for shared dir --- .../e2e/test/baremetalds-e2e-test-commands.sh | 6 +- .../baremetalds-nss-wrapper-hack-commands.sh | 2 +- .../setup/baremetalds-setup-commands.sh | 110 +++++++++--------- .../teardown/baremetalds-teardown-commands.sh | 41 ++++--- 4 files changed, 83 insertions(+), 76 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index e23aade878e7f..6e1916ed17cee 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -13,9 +13,11 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 0 fi -echo "Executing baremetal ds conformance tests" +echo "-----------------------"" +ls -ll ${SHARED_DIR}/nss +echo "-----------------------"" -ls -ll ${SHARED_DIR} +#echo "Executing baremetal ds conformance tests" #test_suite=openshift/conformance/parallel #if [[ -e "${SHARED_DIR}/test-suite.txt" ]]; then diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh index 7bb4b651f8c10..dd2a29b64982f 100755 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh @@ -13,7 +13,7 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 0 fi -dir=/tmp/secret +dir=/tmp/secret/nss if [ ! -d ${dir} ]; then echo "Making ${dir}" diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index a2fe54dd4de37..01111121aa645 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -28,70 +28,70 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then fi echo "-----------------------"" -ls -ll ${SHARED_DIR} +ls -ll ${SHARED_DIR}/nss echo "-----------------------"" -echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" - -# Terraform setup and init for packet server -terraform_home=${ARTIFACT_DIR}/terraform -mkdir -p ${terraform_home} -cd ${terraform_home} - -cat > ${terraform_home}/terraform.tf <<-EOF -provider "packet" { -} - -resource "packet_device" "server" { - count = "1" - project_id = "$PACKET_PROJECT_ID" - hostname = "ipi-$CLUSTER_NAME" - plan = "m2.xlarge.x86" - facilities = ["sjc1", "ewr1"] - operating_system = "centos_7" - billing_cycle = "hourly" -} -EOF - -terraform init - -# Packet returns transients errors when creating devices. -# example, `Oh snap, something went wrong! We've logged the error and will take a look - please reach out to us if you continue having trouble.` -# therefore the terraform apply needs to be retried a few time before giving up. -rc=1 -for r in {1..5}; do terraform apply -auto-approve && rc=0 && break ; done -if test "${rc}" -eq 1; then - echo >&2 "Failed to create packet server" - exit 1 -fi +# echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" + +# # Terraform setup and init for packet server +# terraform_home=${ARTIFACT_DIR}/terraform +# mkdir -p ${terraform_home} +# cd ${terraform_home} + +# cat > ${terraform_home}/terraform.tf <<-EOF +# provider "packet" { +# } + +# resource "packet_device" "server" { +# count = "1" +# project_id = "$PACKET_PROJECT_ID" +# hostname = "ipi-$CLUSTER_NAME" +# plan = "m2.xlarge.x86" +# facilities = ["sjc1", "ewr1"] +# operating_system = "centos_7" +# billing_cycle = "hourly" +# } +# EOF -# Sharing terraform artifacts required by teardown -if [ ! -d ${secret_dir} ]; then - echo "Making ${secret_dir}" - mkdir -p ${secret_dir} -fi +# terraform init + +# # Packet returns transients errors when creating devices. +# # example, `Oh snap, something went wrong! We've logged the error and will take a look - please reach out to us if you continue having trouble.` +# # therefore the terraform apply needs to be retried a few time before giving up. +# rc=1 +# for r in {1..5}; do terraform apply -auto-approve && rc=0 && break ; done +# if test "${rc}" -eq 1; then +# echo >&2 "Failed to create packet server" +# exit 1 +# fi + +# # Sharing terraform artifacts required by teardown +# if [ ! -d ${secret_dir} ]; then +# echo "Making ${secret_dir}" +# mkdir -p ${secret_dir} +# fi -mkdir -p ${secret_dir}/terraform -cp -R ${terraform_home}/terraform.* ${secret_dir}/terraform #Just copying the minimum files required to avoid size limits of /tmp/secrets -ls -ll ${secret_dir}/terraform +# mkdir -p ${secret_dir}/terraform +# cp -R ${terraform_home}/terraform.* ${secret_dir}/terraform #Just copying the minimum files required to avoid size limits of /tmp/secrets +# ls -ll ${secret_dir}/terraform -# Sharing artifacts required by teardown -touch ${secret_dir}/packet-server-ip -jq -r '.modules[0].resources["packet_device.server"].primary.attributes.access_public_ipv4' terraform.tfstate > ${secret_dir}/packet-server-ip +# # Sharing artifacts required by teardown +# touch ${secret_dir}/packet-server-ip +# jq -r '.modules[0].resources["packet_device.server"].primary.attributes.access_public_ipv4' terraform.tfstate > ${secret_dir}/packet-server-ip -# Fetch packet server IP -export IP=$(cat ${secret_dir}/packet-server-ip) -echo "Packet server IP is ${IP}" +# # Fetch packet server IP +# export IP=$(cat ${secret_dir}/packet-server-ip) +# echo "Packet server IP is ${IP}" -# NSS wrapper preparation -export HOME=/tmp/nss_wrapper -mkdir -p $HOME +# # NSS wrapper preparation +# export HOME=/tmp/nss_wrapper +# mkdir -p $HOME -cp ${SHARED_DIR}/libnss_wrapper.so ${HOME} -cp ${SHARED_DIR}/mock-nss.sh ${HOME} +# cp ${SHARED_DIR}/libnss_wrapper.so ${HOME} +# cp ${SHARED_DIR}/mock-nss.sh ${HOME} -export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so -bash ${HOME}/mock-nss.sh +# export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so +# bash ${HOME}/mock-nss.sh ######### diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 68101d9e0d66d..7a14d0a54de22 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -20,31 +20,36 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 1 fi -# Terraform setup and teardown for packet server -terraform_home=${ARTIFACT_DIR}/terraform +echo "-----------------------"" +ls -ll ${SHARED_DIR}/nss +echo "-----------------------"" -ls -ll ${SHARED_DIR} -if [ ! -d ${SHARED_DIR}/terraform ]; then - echo >&2 "Cannot teardown packet server, terraform config files are missing" - exit 1 -fi +# # Terraform setup and teardown for packet server +# terraform_home=${ARTIFACT_DIR}/terraform + +# ls -ll ${SHARED_DIR} + +# if [ ! -d ${SHARED_DIR}/terraform ]; then +# echo >&2 "Cannot teardown packet server, terraform config files are missing" +# exit 1 +# fi -cp -R ${SHARED_DIR}/terraform ${ARTIFACT_DIR} # Retrieving shared terraform configuration -cd ${terraform_home} +# cp -R ${SHARED_DIR}/terraform ${ARTIFACT_DIR} # Retrieving shared terraform configuration +# cd ${terraform_home} -ls -ll +# ls -ll -# if [ -n "$IP" ] ; then -# echo "Getting logs" -# ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C /tmp/artifacts -xzf - -# sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' /tmp/artifacts/root/dev-scripts/logs/* -# fi +# # if [ -n "$IP" ] ; then +# # echo "Getting logs" +# # ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C /tmp/artifacts -xzf - +# # sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' /tmp/artifacts/root/dev-scripts/logs/* +# # fi -echo "Deprovisioning cluster ..." -terraform init -for r in {1..5}; do terraform destroy -auto-approve && break ; done +# echo "Deprovisioning cluster ..." +# terraform init +# for r in {1..5}; do terraform destroy -auto-approve && break ; done From 7c46ab602fd576a1c22b8216bc815159258ad040 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Mon, 2 Mar 2020 09:59:57 +0100 Subject: [PATCH 036/100] Second share dir test --- .../e2e/test/baremetalds-e2e-test-commands.sh | 10 +++++++--- .../baremetalds/setup/baremetalds-setup-commands.sh | 9 ++++++--- .../teardown/baremetalds-teardown-commands.sh | 9 ++++++--- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 6e1916ed17cee..cfd8aa863ec3d 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -13,9 +13,13 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 0 fi -echo "-----------------------"" -ls -ll ${SHARED_DIR}/nss -echo "-----------------------"" +echo "-----------------------" +mkdir -p /tmp/nss +cp -R ${SHARED_DIR}/nss /tmp/nss +ls -ll /tmp/nss +cat /tmp/nss/mock-nss.sh +echo "-----------------------" + #echo "Executing baremetal ds conformance tests" diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 01111121aa645..c328fcb52f066 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -27,9 +27,12 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 1 fi -echo "-----------------------"" -ls -ll ${SHARED_DIR}/nss -echo "-----------------------"" +echo "-----------------------" +mkdir -p /tmp/nss +cp -R ${SHARED_DIR}/nss /tmp/nss +ls -ll /tmp/nss +cat /tmp/nss/mock-nss.sh +echo "-----------------------" # echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 7a14d0a54de22..3bd57b4a46548 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -20,9 +20,12 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 1 fi -echo "-----------------------"" -ls -ll ${SHARED_DIR}/nss -echo "-----------------------"" +echo "-----------------------" +mkdir -p /tmp/nss +cp -R ${SHARED_DIR}/nss /tmp/nss +ls -ll /tmp/nss +cat /tmp/nss/mock-nss.sh +echo "-----------------------" # # Terraform setup and teardown for packet server From 82427359afe2663973fec72748c7508fdaaace05 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Mon, 2 Mar 2020 10:37:51 +0100 Subject: [PATCH 037/100] Third sharing dir test --- .../baremetalds/e2e/test/baremetalds-e2e-test-commands.sh | 2 ++ .../nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh | 1 + .../baremetalds/setup/baremetalds-setup-commands.sh | 1 + .../baremetalds/teardown/baremetalds-teardown-commands.sh | 2 ++ 4 files changed, 6 insertions(+) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index cfd8aa863ec3d..8f24baa466783 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -15,12 +15,14 @@ fi echo "-----------------------" mkdir -p /tmp/nss +ls -ll ${SHARED_DIR} cp -R ${SHARED_DIR}/nss /tmp/nss ls -ll /tmp/nss cat /tmp/nss/mock-nss.sh echo "-----------------------" + #echo "Executing baremetal ds conformance tests" #test_suite=openshift/conformance/parallel diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh index dd2a29b64982f..8b6ab76e41900 100755 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh @@ -22,6 +22,7 @@ fi echo "Copying nss artifacts to ${dir}" cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${dir} +ls -ll ${dir} diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index c328fcb52f066..fb322e7c742c1 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -29,6 +29,7 @@ fi echo "-----------------------" mkdir -p /tmp/nss +ls -ll ${SHARED_DIR} cp -R ${SHARED_DIR}/nss /tmp/nss ls -ll /tmp/nss cat /tmp/nss/mock-nss.sh diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 3bd57b4a46548..fd813215cb00f 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -22,12 +22,14 @@ fi echo "-----------------------" mkdir -p /tmp/nss +ls -ll ${SHARED_DIR} cp -R ${SHARED_DIR}/nss /tmp/nss ls -ll /tmp/nss cat /tmp/nss/mock-nss.sh echo "-----------------------" + # # Terraform setup and teardown for packet server # terraform_home=${ARTIFACT_DIR}/terraform From dc9ac843c167c3f4d85062f5c66589eec2c935cd Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Mon, 2 Mar 2020 11:54:56 +0100 Subject: [PATCH 038/100] Fourt thest on shared dir --- .../baremetalds/e2e/test/baremetalds-e2e-test-commands.sh | 5 +++-- .../wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh | 2 +- .../baremetalds/setup/baremetalds-setup-commands.sh | 4 ++-- .../baremetalds/teardown/baremetalds-teardown-commands.sh | 5 ++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 8f24baa466783..5a22e6129aff1 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -16,13 +16,14 @@ fi echo "-----------------------" mkdir -p /tmp/nss ls -ll ${SHARED_DIR} -cp -R ${SHARED_DIR}/nss /tmp/nss +cp ${SHARED_DIR}/* /tmp/nss ls -ll /tmp/nss -cat /tmp/nss/mock-nss.sh +cat ${SHARED_DIR}/mock-nss.sh echo "-----------------------" + #echo "Executing baremetal ds conformance tests" #test_suite=openshift/conformance/parallel diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh index 8b6ab76e41900..b82538bc8c0f5 100755 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh @@ -13,7 +13,7 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 0 fi -dir=/tmp/secret/nss +dir=/tmp/secret if [ ! -d ${dir} ]; then echo "Making ${dir}" diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index fb322e7c742c1..10863b5a8dab6 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -30,9 +30,9 @@ fi echo "-----------------------" mkdir -p /tmp/nss ls -ll ${SHARED_DIR} -cp -R ${SHARED_DIR}/nss /tmp/nss +cp ${SHARED_DIR}/* /tmp/nss ls -ll /tmp/nss -cat /tmp/nss/mock-nss.sh +cat ${SHARED_DIR}/mock-nss.sh echo "-----------------------" # echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index fd813215cb00f..fb673b4ca975d 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -23,13 +23,12 @@ fi echo "-----------------------" mkdir -p /tmp/nss ls -ll ${SHARED_DIR} -cp -R ${SHARED_DIR}/nss /tmp/nss +cp ${SHARED_DIR}/* /tmp/nss ls -ll /tmp/nss -cat /tmp/nss/mock-nss.sh +cat ${SHARED_DIR}/mock-nss.sh echo "-----------------------" - # # Terraform setup and teardown for packet server # terraform_home=${ARTIFACT_DIR}/terraform From 5e527028390a4148f75a883c06c6c0d55d828777 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Mon, 2 Mar 2020 12:33:47 +0100 Subject: [PATCH 039/100] Re-enable terrform provisioning steps --- .../e2e/test/baremetalds-e2e-test-commands.sh | 7 -- .../baremetalds-nss-wrapper-hack-commands.sh | 1 - .../setup/baremetalds-setup-commands.sh | 114 ++++++++---------- .../teardown/baremetalds-teardown-commands.sh | 45 +++---- 4 files changed, 67 insertions(+), 100 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 5a22e6129aff1..78abf169167af 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -14,16 +14,9 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then fi echo "-----------------------" -mkdir -p /tmp/nss ls -ll ${SHARED_DIR} -cp ${SHARED_DIR}/* /tmp/nss -ls -ll /tmp/nss -cat ${SHARED_DIR}/mock-nss.sh echo "-----------------------" - - - #echo "Executing baremetal ds conformance tests" #test_suite=openshift/conformance/parallel diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh index b82538bc8c0f5..7bb4b651f8c10 100755 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh @@ -22,7 +22,6 @@ fi echo "Copying nss artifacts to ${dir}" cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${dir} -ls -ll ${dir} diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 10863b5a8dab6..b756d9ffdcfb7 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -27,75 +27,65 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 1 fi -echo "-----------------------" -mkdir -p /tmp/nss -ls -ll ${SHARED_DIR} -cp ${SHARED_DIR}/* /tmp/nss -ls -ll /tmp/nss -cat ${SHARED_DIR}/mock-nss.sh -echo "-----------------------" - -# echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" - -# # Terraform setup and init for packet server -# terraform_home=${ARTIFACT_DIR}/terraform -# mkdir -p ${terraform_home} -# cd ${terraform_home} - -# cat > ${terraform_home}/terraform.tf <<-EOF -# provider "packet" { -# } - -# resource "packet_device" "server" { -# count = "1" -# project_id = "$PACKET_PROJECT_ID" -# hostname = "ipi-$CLUSTER_NAME" -# plan = "m2.xlarge.x86" -# facilities = ["sjc1", "ewr1"] -# operating_system = "centos_7" -# billing_cycle = "hourly" -# } -# EOF - -# terraform init - -# # Packet returns transients errors when creating devices. -# # example, `Oh snap, something went wrong! We've logged the error and will take a look - please reach out to us if you continue having trouble.` -# # therefore the terraform apply needs to be retried a few time before giving up. -# rc=1 -# for r in {1..5}; do terraform apply -auto-approve && rc=0 && break ; done -# if test "${rc}" -eq 1; then -# echo >&2 "Failed to create packet server" -# exit 1 -# fi +echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" + +# Terraform setup and init for packet server +terraform_home=${ARTIFACT_DIR}/terraform +mkdir -p ${terraform_home} +cd ${terraform_home} + +cat > ${terraform_home}/terraform.tf <<-EOF +provider "packet" { +} + +resource "packet_device" "server" { + count = "1" + project_id = "$PACKET_PROJECT_ID" + hostname = "ipi-$CLUSTER_NAME" + plan = "m2.xlarge.x86" + facilities = ["sjc1", "ewr1"] + operating_system = "centos_7" + billing_cycle = "hourly" +} +EOF + +terraform init + +# Packet returns transients errors when creating devices. +# example, `Oh snap, something went wrong! We've logged the error and will take a look - please reach out to us if you continue having trouble.` +# therefore the terraform apply needs to be retried a few time before giving up. +rc=1 +for r in {1..5}; do terraform apply -auto-approve && rc=0 && break ; done +if test "${rc}" -eq 1; then + echo >&2 "Failed to create packet server" + exit 1 +fi -# # Sharing terraform artifacts required by teardown -# if [ ! -d ${secret_dir} ]; then -# echo "Making ${secret_dir}" -# mkdir -p ${secret_dir} -# fi +# Sharing terraform artifacts required by teardown +if [ ! -d ${secret_dir} ]; then + echo "Making ${secret_dir}" + mkdir -p ${secret_dir} +fi -# mkdir -p ${secret_dir}/terraform -# cp -R ${terraform_home}/terraform.* ${secret_dir}/terraform #Just copying the minimum files required to avoid size limits of /tmp/secrets -# ls -ll ${secret_dir}/terraform +cp ${terraform_home}/terraform.* ${secret_dir} -# # Sharing artifacts required by teardown -# touch ${secret_dir}/packet-server-ip -# jq -r '.modules[0].resources["packet_device.server"].primary.attributes.access_public_ipv4' terraform.tfstate > ${secret_dir}/packet-server-ip +# Sharing artifacts required by teardown +jq -r '.modules[0].resources["packet_device.server"].primary.attributes.access_public_ipv4' terraform.tfstate > /tmp/packet-server-ip +cp /tmp/packet-server-ip ${secret_dir} -# # Fetch packet server IP -# export IP=$(cat ${secret_dir}/packet-server-ip) -# echo "Packet server IP is ${IP}" +# Fetch packet server IP +export IP=$(cat /tmp/packet-server-ip) +echo "Packet server IP is ${IP}" -# # NSS wrapper preparation -# export HOME=/tmp/nss_wrapper -# mkdir -p $HOME +# NSS wrapper preparation +export HOME=/tmp/nss_wrapper +mkdir -p $HOME -# cp ${SHARED_DIR}/libnss_wrapper.so ${HOME} -# cp ${SHARED_DIR}/mock-nss.sh ${HOME} +cp ${SHARED_DIR}/libnss_wrapper.so ${HOME} +cp ${SHARED_DIR}/mock-nss.sh ${HOME} -# export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so -# bash ${HOME}/mock-nss.sh +export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so +bash ${HOME}/mock-nss.sh ######### diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index fb673b4ca975d..0ff1233210ab1 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -20,40 +20,25 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 1 fi -echo "-----------------------" -mkdir -p /tmp/nss -ls -ll ${SHARED_DIR} -cp ${SHARED_DIR}/* /tmp/nss -ls -ll /tmp/nss -cat ${SHARED_DIR}/mock-nss.sh -echo "-----------------------" +ls -ll ${SHARED_DIR} +# Terraform setup and teardown for packet server +terraform_home=${ARTIFACT_DIR}/terraform +mkdir -p ${terraform_home} +cd ${terraform_home} -# # Terraform setup and teardown for packet server -# terraform_home=${ARTIFACT_DIR}/terraform +cp ${SHARED_DIR}/terraform.* ${terraform_home} +ls -ll -# ls -ll ${SHARED_DIR} +# if [ -n "$IP" ] ; then +# echo "Getting logs" +# ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C /tmp/artifacts -xzf - +# sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' /tmp/artifacts/root/dev-scripts/logs/* +# fi -# if [ ! -d ${SHARED_DIR}/terraform ]; then -# echo >&2 "Cannot teardown packet server, terraform config files are missing" -# exit 1 -# fi - -# cp -R ${SHARED_DIR}/terraform ${ARTIFACT_DIR} # Retrieving shared terraform configuration -# cd ${terraform_home} - -# ls -ll - - -# # if [ -n "$IP" ] ; then -# # echo "Getting logs" -# # ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C /tmp/artifacts -xzf - -# # sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' /tmp/artifacts/root/dev-scripts/logs/* -# # fi - -# echo "Deprovisioning cluster ..." -# terraform init -# for r in {1..5}; do terraform destroy -auto-approve && break ; done +echo "Deprovisioning cluster ..." +terraform init +for r in {1..5}; do terraform destroy -auto-approve && break ; done From 8ea0f2c9d4d76546b552fe56214510d4b5fae559 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Mon, 2 Mar 2020 13:04:05 +0100 Subject: [PATCH 040/100] Fix teardown step base image --- .../baremetalds/e2e/test/baremetalds-e2e-test-commands.sh | 6 +----- .../baremetalds/teardown/baremetalds-teardown-commands.sh | 3 --- .../baremetalds/teardown/baremetalds-teardown-ref.yaml | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 78abf169167af..850437c6da6ef 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -13,11 +13,7 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 0 fi -echo "-----------------------" -ls -ll ${SHARED_DIR} -echo "-----------------------" - -#echo "Executing baremetal ds conformance tests" +echo "Executing baremetal ds conformance tests" #test_suite=openshift/conformance/parallel #if [[ -e "${SHARED_DIR}/test-suite.txt" ]]; then diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 0ff1233210ab1..5929e04bf5ad9 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -20,15 +20,12 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 1 fi -ls -ll ${SHARED_DIR} - # Terraform setup and teardown for packet server terraform_home=${ARTIFACT_DIR}/terraform mkdir -p ${terraform_home} cd ${terraform_home} cp ${SHARED_DIR}/terraform.* ${terraform_home} -ls -ll # if [ -n "$IP" ] ; then # echo "Getting logs" diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-ref.yaml b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-ref.yaml index 16bb40dc6620e..18117896949bd 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-ref.yaml +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-ref.yaml @@ -1,6 +1,6 @@ ref: as: baremetalds-teardown - from: stable:tests + from: stable:upi-installer commands: baremetalds-teardown-commands.sh resources: requests: From a58a020034c57e8616834bb2b5bfa15082120e3b Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Mon, 2 Mar 2020 15:06:41 +0100 Subject: [PATCH 041/100] Add packet auth token for teardown step --- .../baremetalds/teardown/baremetalds-teardown-commands.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 5929e04bf5ad9..99a86af400f1d 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -9,6 +9,7 @@ export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey set +x export SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${SSH_PRIV_KEY_PATH}" +export PACKET_AUTH_TOKEN=$(cat ${cluster_profile}/.packetcred) set -x echo "************ baremetalds teardown command ************" From 9aba4180af28d9877a5d8a6474ada98c56a723bc Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Mon, 2 Mar 2020 16:20:00 +0100 Subject: [PATCH 042/100] Enabled dev-scripts checkout and run --- .../setup/baremetalds-setup-commands.sh | 78 +++++++++---------- .../teardown/baremetalds-teardown-commands.sh | 12 +-- 2 files changed, 46 insertions(+), 44 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index b756d9ffdcfb7..2b1cacc9c8c1a 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -87,60 +87,60 @@ cp ${SHARED_DIR}/mock-nss.sh ${HOME} export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so bash ${HOME}/mock-nss.sh -######### +######### dev-scripts checkout and run -# for x in $(seq 10) ; do -# test $x == 10 && exit 1 -# ssh $SSHOPTS root@$IP hostname && break -# sleep 10 -# done +for x in $(seq 10) ; do + test $x == 10 && exit 1 + ssh $SSHOPTS root@$IP hostname && break + sleep 10 +done -# scp $SSHOPTS ${PULL_SECRET_PATH} root@$IP:pull-secret -# timeout -s 9 175m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g' +scp $SSHOPTS ${PULL_SECRET_PATH} root@$IP:pull-secret +timeout -s 9 175m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g' -# set -ex +set -ex -# yum install -y git +yum install -y git -# # python2-cryptography needs to come from delorean-master-testing, priority of packet.repo overrides it -# # remove the priority and instead ensure the packet repo is named first alphabetically -# # this way it is prefered but it isn't a hard override when newer versions are found elsewhere -# sed -i -e 's/priority.*//g' /etc/yum.repos.d/packet.repo -# sed -i -e 's/packet-/a_packet-/g' /etc/yum.repos.d/packet.repo +# python2-cryptography needs to come from delorean-master-testing, priority of packet.repo overrides it +# remove the priority and instead ensure the packet repo is named first alphabetically +# this way it is prefered but it isn't a hard override when newer versions are found elsewhere +sed -i -e 's/priority.*//g' /etc/yum.repos.d/packet.repo +sed -i -e 's/packet-/a_packet-/g' /etc/yum.repos.d/packet.repo -# rm -rf /tmp/artifacts -# mkdir -p /tmp/artifacts +rm -rf /tmp/artifacts +mkdir -p /tmp/artifacts -# if [ ! -e dev-scripts ] ; then -# git clone https://github.com/openshift-metal3/dev-scripts.git -# fi -# cd dev-scripts +if [ ! -e dev-scripts ] ; then + git clone https://github.com/openshift-metal3/dev-scripts.git +fi +cd dev-scripts -# set +x -# echo "export PULL_SECRET='\$(cat /root/pull-secret)'" > /root/dev-scripts/config_root.sh -# set -x +set +x +echo "export PULL_SECRET='\$(cat /root/pull-secret)'" > /root/dev-scripts/config_root.sh +set -x -# curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - +curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - -# #echo "export OPENSHIFT_RELEASE_IMAGE=$MIRROR_BASE:latest" >> /root/dev-scripts/config_root.sh -# echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-01-29-012724" >> /root/dev-scripts/config_root.sh -# echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh -# echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh -# echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh +#echo "export OPENSHIFT_RELEASE_IMAGE=$MIRROR_BASE:latest" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-01-29-012724" >> /root/dev-scripts/config_root.sh +echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh +echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh -# echo 'export KUBECONFIG=/root/dev-scripts/ocp/auth/kubeconfig' >> /root/.bashrc +echo 'export KUBECONFIG=/root/dev-scripts/ocp/auth/kubeconfig' >> /root/.bashrc -# if [ ! -e /opt/dev-scripts/pool ] ; then -# mkdir -p /opt/dev-scripts/pool -# mount -t tmpfs -o size=100G tmpfs /opt/dev-scripts/pool -# fi +if [ ! -e /opt/dev-scripts/pool ] ; then + mkdir -p /opt/dev-scripts/pool + mount -t tmpfs -o size=100G tmpfs /opt/dev-scripts/pool +fi -# timeout -s 9 105m make +timeout -s 9 105m make -# EOF +EOF -# mkdir -p ${ARTIFACT_DIR}/installer/auth -# scp $SSHOPTS root@$IP:./dev-scripts/ocp/auth/kubeconfig ${ARTIFACT_DIR}/installer/auth/kubeconfig +mkdir -p ${ARTIFACT_DIR}/installer/auth +scp $SSHOPTS root@$IP:./dev-scripts/ocp/auth/kubeconfig ${ARTIFACT_DIR}/installer/auth/kubeconfig diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 99a86af400f1d..91d3d49312a8e 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -28,11 +28,13 @@ cd ${terraform_home} cp ${SHARED_DIR}/terraform.* ${terraform_home} -# if [ -n "$IP" ] ; then -# echo "Getting logs" -# ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C /tmp/artifacts -xzf - -# sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' /tmp/artifacts/root/dev-scripts/logs/* -# fi +# Logs fetching +export IP=$(cat ${SHARED_DIR}/packet-server-ip) +if [ -n "$IP" ] ; then + echo "Getting logs" + ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - + sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* +fi echo "Deprovisioning cluster ..." terraform init From 9ac9790a98e1eec97b8e8879b7401be77b85daf5 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Mon, 2 Mar 2020 17:56:03 +0100 Subject: [PATCH 043/100] Remove MIRROR_BASE env var --- .../baremetalds/setup/baremetalds-setup-commands.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 2b1cacc9c8c1a..f19842a941866 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -122,7 +122,6 @@ set -x curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - -#echo "export OPENSHIFT_RELEASE_IMAGE=$MIRROR_BASE:latest" >> /root/dev-scripts/config_root.sh echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-01-29-012724" >> /root/dev-scripts/config_root.sh echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh From 2dedf76254ed45d4e0df5b1bc9f2c04999dbcc2c Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Mon, 2 Mar 2020 22:17:20 +0100 Subject: [PATCH 044/100] Bumped OPENSHIFT_RELEASE_IMAGE --- .../baremetalds/setup/baremetalds-setup-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index f19842a941866..fbc3cbffe4ee4 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -122,7 +122,7 @@ set -x curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - -echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-01-29-012724" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-03-02-180524" >> /root/dev-scripts/config_root.sh echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh From 137cf8a22cbc11575938bef31ae43534e2491299 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Tue, 3 Mar 2020 08:42:16 +0100 Subject: [PATCH 045/100] copy logs test --- .../e2e/baremetalds-e2e-workflow.yaml | 10 ++++---- .../teardown/baremetalds-teardown-commands.sh | 25 +++++++++++-------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml index 9e1a6ef102fa9..32e90fb40c04f 100644 --- a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml +++ b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml @@ -1,11 +1,11 @@ workflow: as: baremetalds-e2e steps: - pre: - - ref: baremetalds-nss-wrapper-hack - - ref: baremetalds-setup - test: - - ref: baremetalds-e2e-test +# pre: +# - ref: baremetalds-nss-wrapper-hack +# - ref: baremetalds-setup +# test: +# - ref: baremetalds-e2e-test post: - ref: baremetalds-teardown documentation: |- diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 91d3d49312a8e..52854f3d5ce03 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -22,23 +22,28 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then fi # Terraform setup and teardown for packet server -terraform_home=${ARTIFACT_DIR}/terraform -mkdir -p ${terraform_home} -cd ${terraform_home} +### terraform_home=${ARTIFACT_DIR}/terraform +### mkdir -p ${terraform_home} +### cd ${terraform_home} -cp ${SHARED_DIR}/terraform.* ${terraform_home} +### cp ${SHARED_DIR}/terraform.* ${terraform_home} + +whoami # Logs fetching -export IP=$(cat ${SHARED_DIR}/packet-server-ip) +### export IP=$(cat ${SHARED_DIR}/packet-server-ip) +export IP=147.75.69.55 if [ -n "$IP" ] ; then echo "Getting logs" - ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - - sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* +### ### ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - + mkdir -p ${ARTIFACT_DIR}/dev-scripts/logs/ + scp $SSHOPTS -r root@IP:/root/dev-scripts/logs ${ARTIFACT_DIR}/dev-scripts/logs/ + sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/dev-scripts/logs/* fi -echo "Deprovisioning cluster ..." -terraform init -for r in {1..5}; do terraform destroy -auto-approve && break ; done +### echo "Deprovisioning cluster ..." +### terraform init +### for r in {1..5}; do terraform destroy -auto-approve && break ; done From b47cbb19acec3a6cdae09089302519ffffa837fd Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Tue, 3 Mar 2020 09:54:32 +0100 Subject: [PATCH 046/100] Secondcopy logs test --- .../baremetalds/teardown/baremetalds-teardown-commands.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 52854f3d5ce03..a4d2897b8df5e 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -28,8 +28,6 @@ fi ### cp ${SHARED_DIR}/terraform.* ${terraform_home} -whoami - # Logs fetching ### export IP=$(cat ${SHARED_DIR}/packet-server-ip) export IP=147.75.69.55 From 2cf908f571cf18e387bd1db2576ffc586610d975 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Tue, 3 Mar 2020 10:32:33 +0100 Subject: [PATCH 047/100] Apply nss fix to teardown step --- .../baremetalds/e2e/baremetalds-e2e-workflow.yaml | 4 ++-- .../teardown/baremetalds-teardown-commands.sh | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml index 32e90fb40c04f..58f5386ee0b92 100644 --- a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml +++ b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml @@ -1,8 +1,8 @@ workflow: as: baremetalds-e2e steps: -# pre: -# - ref: baremetalds-nss-wrapper-hack + pre: + - ref: baremetalds-nss-wrapper-hack # - ref: baremetalds-setup # test: # - ref: baremetalds-e2e-test diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index a4d2897b8df5e..873c4f67b6321 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -28,14 +28,21 @@ fi ### cp ${SHARED_DIR}/terraform.* ${terraform_home} +# Applying NSS fix +cp ${SHARED_DIR}/libnss_wrapper.so ${HOME} +cp ${SHARED_DIR}/mock-nss.sh ${HOME} + +export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so +bash ${HOME}/mock-nss.sh + # Logs fetching ### export IP=$(cat ${SHARED_DIR}/packet-server-ip) export IP=147.75.69.55 if [ -n "$IP" ] ; then echo "Getting logs" -### ### ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - - mkdir -p ${ARTIFACT_DIR}/dev-scripts/logs/ - scp $SSHOPTS -r root@IP:/root/dev-scripts/logs ${ARTIFACT_DIR}/dev-scripts/logs/ + ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - + ###mkdir -p ${ARTIFACT_DIR}/dev-scripts/logs/ + ###scp $SSHOPTS -r root@IP:/root/dev-scripts/logs ${ARTIFACT_DIR}/dev-scripts/logs/ sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/dev-scripts/logs/* fi From df7d8664f29206ae4a9ef211cf521a8c1b92eaf7 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Tue, 3 Mar 2020 10:48:20 +0100 Subject: [PATCH 048/100] Add dir for nss fix --- .../baremetalds/teardown/baremetalds-teardown-commands.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 873c4f67b6321..72811ce610daf 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -29,6 +29,9 @@ fi ### cp ${SHARED_DIR}/terraform.* ${terraform_home} # Applying NSS fix +export HOME=/tmp/nss_wrapper +mkdir -p $HOME + cp ${SHARED_DIR}/libnss_wrapper.so ${HOME} cp ${SHARED_DIR}/mock-nss.sh ${HOME} From 181a1180825f925257ab53241f8abcbd792c2ad8 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Tue, 3 Mar 2020 11:22:52 +0100 Subject: [PATCH 049/100] Fix dev-scripts log path name --- .../baremetalds/teardown/baremetalds-teardown-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 72811ce610daf..f763f6f78918f 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -46,7 +46,7 @@ if [ -n "$IP" ] ; then ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - ###mkdir -p ${ARTIFACT_DIR}/dev-scripts/logs/ ###scp $SSHOPTS -r root@IP:/root/dev-scripts/logs ${ARTIFACT_DIR}/dev-scripts/logs/ - sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/dev-scripts/logs/* + sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* fi ### echo "Deprovisioning cluster ..." From a995d4e227d6997e4de42c34e9ddf50b204449bf Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Tue, 3 Mar 2020 11:55:19 +0100 Subject: [PATCH 050/100] Re-enable all the steps --- .../e2e/baremetalds-e2e-workflow.yaml | 6 ++-- .../setup/baremetalds-setup-commands.sh | 7 ++--- .../teardown/baremetalds-teardown-commands.sh | 29 +++++++------------ 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml index 58f5386ee0b92..9e1a6ef102fa9 100644 --- a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml +++ b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml @@ -3,9 +3,9 @@ workflow: steps: pre: - ref: baremetalds-nss-wrapper-hack -# - ref: baremetalds-setup -# test: -# - ref: baremetalds-e2e-test + - ref: baremetalds-setup + test: + - ref: baremetalds-e2e-test post: - ref: baremetalds-teardown documentation: |- diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index fbc3cbffe4ee4..11a7138086ae2 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -77,18 +77,15 @@ cp /tmp/packet-server-ip ${secret_dir} export IP=$(cat /tmp/packet-server-ip) echo "Packet server IP is ${IP}" -# NSS wrapper preparation +# Applying NSS fix for SSH connection export HOME=/tmp/nss_wrapper mkdir -p $HOME - cp ${SHARED_DIR}/libnss_wrapper.so ${HOME} cp ${SHARED_DIR}/mock-nss.sh ${HOME} - export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so bash ${HOME}/mock-nss.sh -######### dev-scripts checkout and run - +# Checkout dev-scripts and make for x in $(seq 10) ; do test $x == 10 && exit 1 ssh $SSHOPTS root@$IP hostname && break diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index f763f6f78918f..84c02e237b2c9 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -21,37 +21,30 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 1 fi -# Terraform setup and teardown for packet server -### terraform_home=${ARTIFACT_DIR}/terraform -### mkdir -p ${terraform_home} -### cd ${terraform_home} - -### cp ${SHARED_DIR}/terraform.* ${terraform_home} - -# Applying NSS fix +# Applying NSS fix for SSH connection export HOME=/tmp/nss_wrapper mkdir -p $HOME - cp ${SHARED_DIR}/libnss_wrapper.so ${HOME} cp ${SHARED_DIR}/mock-nss.sh ${HOME} - export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so bash ${HOME}/mock-nss.sh -# Logs fetching -### export IP=$(cat ${SHARED_DIR}/packet-server-ip) -export IP=147.75.69.55 +# Get dev-scripts logs +export IP=$(cat ${SHARED_DIR}/packet-server-ip) if [ -n "$IP" ] ; then echo "Getting logs" ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - - ###mkdir -p ${ARTIFACT_DIR}/dev-scripts/logs/ - ###scp $SSHOPTS -r root@IP:/root/dev-scripts/logs ${ARTIFACT_DIR}/dev-scripts/logs/ sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* fi -### echo "Deprovisioning cluster ..." -### terraform init -### for r in {1..5}; do terraform destroy -auto-approve && break ; done +# Shutdown packet server +terraform_home=${ARTIFACT_DIR}/terraform +mkdir -p ${terraform_home} +cp ${SHARED_DIR}/terraform.* ${terraform_home} +echo "Deprovisioning cluster..." +cd ${terraform_home} +terraform init +for r in {1..5}; do terraform destroy -auto-approve && break ; done From d209bac185c3fda0cdc09bdb5839261bbc2fbaaf Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Tue, 3 Mar 2020 13:18:14 +0100 Subject: [PATCH 051/100] Remove kubeconfig copy --- .../baremetalds/setup/baremetalds-setup-commands.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 11a7138086ae2..1e0a7bcd21850 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -135,8 +135,6 @@ timeout -s 9 105m make EOF -mkdir -p ${ARTIFACT_DIR}/installer/auth -scp $SSHOPTS root@$IP:./dev-scripts/ocp/auth/kubeconfig ${ARTIFACT_DIR}/installer/auth/kubeconfig From 37a28b2c2bbad9caea7c95f6e2325bbd84bf9f88 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Tue, 3 Mar 2020 14:57:44 +0100 Subject: [PATCH 052/100] Another sharing dir test --- .../e2e/baremetalds-e2e-workflow.yaml | 3 ++- .../e2e/test/baremetalds-e2e-test-commands.sh | 3 +++ .../setup/baremetalds-setup-commands.sh | 3 +++ .../teardown/baremetalds-teardown-commands.sh | 20 +++++++++++-------- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml index 9e1a6ef102fa9..26d370312e9d8 100644 --- a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml +++ b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml @@ -3,10 +3,11 @@ workflow: steps: pre: - ref: baremetalds-nss-wrapper-hack - - ref: baremetalds-setup +# - ref: baremetalds-setup test: - ref: baremetalds-e2e-test post: + - ref: baremetalds-nss-wrapper-hack - ref: baremetalds-teardown documentation: |- The Baremetal DS E2E workflow executes the common end-to-end test suite on a cluster provisioned by running dev-scripts on a packet server. diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 850437c6da6ef..82593ab7afbf4 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -13,6 +13,9 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 0 fi +echo "-------[ $SHARED_DIR ]" +ls -ll ${SHARED_DIR} + echo "Executing baremetal ds conformance tests" #test_suite=openshift/conformance/parallel diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 1e0a7bcd21850..289395678be4f 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -27,6 +27,9 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 1 fi +echo "-------[ $SHARED_DIR ]" +ls -ll ${SHARED_DIR} + echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" # Terraform setup and init for packet server diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 84c02e237b2c9..88ef68d10ff28 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -21,6 +21,9 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 1 fi +echo "-------[ $SHARED_DIR ]" +ls -ll ${SHARED_DIR} + # Applying NSS fix for SSH connection export HOME=/tmp/nss_wrapper mkdir -p $HOME @@ -30,7 +33,8 @@ export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAM bash ${HOME}/mock-nss.sh # Get dev-scripts logs -export IP=$(cat ${SHARED_DIR}/packet-server-ip) +### export IP=$(cat ${SHARED_DIR}/packet-server-ip) +export IP=139.178.68.175 if [ -n "$IP" ] ; then echo "Getting logs" ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - @@ -38,13 +42,13 @@ if [ -n "$IP" ] ; then fi # Shutdown packet server -terraform_home=${ARTIFACT_DIR}/terraform -mkdir -p ${terraform_home} -cp ${SHARED_DIR}/terraform.* ${terraform_home} -echo "Deprovisioning cluster..." -cd ${terraform_home} -terraform init -for r in {1..5}; do terraform destroy -auto-approve && break ; done +### terraform_home=${ARTIFACT_DIR}/terraform +### mkdir -p ${terraform_home} +### cp ${SHARED_DIR}/terraform.* ${terraform_home} +### echo "Deprovisioning cluster..." +### cd ${terraform_home} +### terraform init +### for r in {1..5}; do terraform destroy -auto-approve && break ; done From 69e569317f2d81d216353348112a52d6b26c8031 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Tue, 3 Mar 2020 15:16:59 +0100 Subject: [PATCH 053/100] Move dev-scripts logs gathering into setup step --- .../e2e/baremetalds-e2e-workflow.yaml | 3 +- .../setup/baremetalds-setup-commands.sh | 6 ++++ .../teardown/baremetalds-teardown-commands.sh | 31 +++++-------------- 3 files changed, 14 insertions(+), 26 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml index 26d370312e9d8..9e1a6ef102fa9 100644 --- a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml +++ b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml @@ -3,11 +3,10 @@ workflow: steps: pre: - ref: baremetalds-nss-wrapper-hack -# - ref: baremetalds-setup + - ref: baremetalds-setup test: - ref: baremetalds-e2e-test post: - - ref: baremetalds-nss-wrapper-hack - ref: baremetalds-teardown documentation: |- The Baremetal DS E2E workflow executes the common end-to-end test suite on a cluster provisioned by running dev-scripts on a packet server. diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 289395678be4f..07aebccf7f0e4 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -138,6 +138,12 @@ timeout -s 9 105m make EOF +# Get dev-scripts logs +echo "dev-scripts setup completed, fetching logs" +ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - +sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* + + diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 88ef68d10ff28..56b8f5b397131 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -24,31 +24,14 @@ fi echo "-------[ $SHARED_DIR ]" ls -ll ${SHARED_DIR} -# Applying NSS fix for SSH connection -export HOME=/tmp/nss_wrapper -mkdir -p $HOME -cp ${SHARED_DIR}/libnss_wrapper.so ${HOME} -cp ${SHARED_DIR}/mock-nss.sh ${HOME} -export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so -bash ${HOME}/mock-nss.sh - -# Get dev-scripts logs -### export IP=$(cat ${SHARED_DIR}/packet-server-ip) -export IP=139.178.68.175 -if [ -n "$IP" ] ; then - echo "Getting logs" - ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - - sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* -fi - # Shutdown packet server -### terraform_home=${ARTIFACT_DIR}/terraform -### mkdir -p ${terraform_home} -### cp ${SHARED_DIR}/terraform.* ${terraform_home} -### echo "Deprovisioning cluster..." -### cd ${terraform_home} -### terraform init -### for r in {1..5}; do terraform destroy -auto-approve && break ; done +terraform_home=${ARTIFACT_DIR}/terraform +mkdir -p ${terraform_home} +cp ${SHARED_DIR}/terraform.* ${terraform_home} +echo "Deprovisioning cluster..." +cd ${terraform_home} +terraform init +for r in {1..5}; do terraform destroy -auto-approve && break ; done From 5179afd4adc2acd1e8279c014a40f84917c86c98 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 4 Mar 2020 11:36:17 +0100 Subject: [PATCH 054/100] First test run --- .../e2e/test/baremetalds-e2e-test-commands.sh | 35 +++++++++++++------ .../setup/baremetalds-setup-commands.sh | 3 ++ 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 82593ab7afbf4..168f51cfa8257 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -4,6 +4,12 @@ set -o nounset set -o errexit set -o pipefail +cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile + +export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey +export SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${SSH_PRIV_KEY_PATH}" +export IP=$(cat ${SHARED_DIR}/packet-server-ip) + echo "************ baremetalds test command ************" env | sort @@ -16,14 +22,21 @@ fi echo "-------[ $SHARED_DIR ]" ls -ll ${SHARED_DIR} -echo "Executing baremetal ds conformance tests" - -#test_suite=openshift/conformance/parallel -#if [[ -e "${SHARED_DIR}/test-suite.txt" ]]; then -# test_suite=$(<"${SHARED_DIR}/test-suite.txt") -#fi -# -#openshift-tests run "${test_suite}" \ -# --provider "${TEST_PROVIDER}" \ -# -o /tmp/artifacts/e2e.log \ -# --junit-dir /tmp/artifacts/junit +# Applying NSS fix for SSH connection +export HOME=/tmp/nss_wrapper +mkdir -p $HOME +cp ${SHARED_DIR}/libnss_wrapper.so ${HOME} +cp ${SHARED_DIR}/mock-nss.sh ${HOME} +export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so +bash ${HOME}/mock-nss.sh + +# Copy test runn on packet server +scp $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin + +# Tests execution +test_suite=openshift/conformance/parallel +ssh $SSHOPTS root@$IP openshift-tests run "${TEST_SUITE}" --dry-run | grep 'Area:Networking' | openshift-tests run -o ${ARTIFACT_DIR}/e2e.log --junit-dir ${ARTIFACT_DIR}/junit -f - +rv=$? +ssh $SSHOPTS root@$IP tar -czf - ${ARTIFACT_DIR} | tar -C / -xzf - +return $rv + diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 07aebccf7f0e4..697e0ddde1000 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -143,6 +143,9 @@ echo "dev-scripts setup completed, fetching logs" ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* +### Workaround due the sharing dir bug, to be removed once it will be fixed ### +echo "Copying nss artifacts to ${secret_dir}" +cp ${HOME}/mock-nss.sh ${HOME}/libnss_wrapper.so ${secret_dir} From f961fea8145433a3e65d6c04762327cc64291ac0 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 4 Mar 2020 12:52:58 +0100 Subject: [PATCH 055/100] Add explicity test suite name --- .../baremetalds/e2e/test/baremetalds-e2e-test-commands.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 168f51cfa8257..4aefdac8eef5d 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -34,8 +34,7 @@ bash ${HOME}/mock-nss.sh scp $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin # Tests execution -test_suite=openshift/conformance/parallel -ssh $SSHOPTS root@$IP openshift-tests run "${TEST_SUITE}" --dry-run | grep 'Area:Networking' | openshift-tests run -o ${ARTIFACT_DIR}/e2e.log --junit-dir ${ARTIFACT_DIR}/junit -f - +ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run | grep 'Area:Networking' | openshift-tests run -o ${ARTIFACT_DIR}/e2e.log --junit-dir ${ARTIFACT_DIR}/junit -f - rv=$? ssh $SSHOPTS root@$IP tar -czf - ${ARTIFACT_DIR} | tar -C / -xzf - return $rv From d1157673faa992913a5ac1fb4d06e06f7ad58800 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 4 Mar 2020 16:46:01 +0100 Subject: [PATCH 056/100] Add debug traces for test execution error --- .../e2e/test/baremetalds-e2e-test-commands.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 4aefdac8eef5d..d37e5ac678106 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -23,6 +23,7 @@ echo "-------[ $SHARED_DIR ]" ls -ll ${SHARED_DIR} # Applying NSS fix for SSH connection +echo "### Applying NSS fix" export HOME=/tmp/nss_wrapper mkdir -p $HOME cp ${SHARED_DIR}/libnss_wrapper.so ${HOME} @@ -30,12 +31,19 @@ cp ${SHARED_DIR}/mock-nss.sh ${HOME} export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so bash ${HOME}/mock-nss.sh -# Copy test runn on packet server +# Copy test binaries on packet server +echo "### Copying test binaries" scp $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin # Tests execution +set +e +echo "### Running tests" ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run | grep 'Area:Networking' | openshift-tests run -o ${ARTIFACT_DIR}/e2e.log --junit-dir ${ARTIFACT_DIR}/junit -f - rv=$? +echo "### Fetching results" ssh $SSHOPTS root@$IP tar -czf - ${ARTIFACT_DIR} | tar -C / -xzf - +set -e +echo "### Done! (${rv})" return $rv + From 7a4550ab3142923a75362db840dda3cb50d2cf1e Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 4 Mar 2020 18:57:16 +0100 Subject: [PATCH 057/100] Escaped correctly pipes for remote execution and fixed remote artifacts dir --- .../baremetalds/e2e/test/baremetalds-e2e-test-commands.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index d37e5ac678106..55af6be18a2b2 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -38,12 +38,12 @@ scp $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin # Tests execution set +e echo "### Running tests" -ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run | grep 'Area:Networking' | openshift-tests run -o ${ARTIFACT_DIR}/e2e.log --junit-dir ${ARTIFACT_DIR}/junit -f - +ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep 'Area:Networking' \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - rv=$? echo "### Fetching results" -ssh $SSHOPTS root@$IP tar -czf - ${ARTIFACT_DIR} | tar -C / -xzf - +ssh $SSHOPTS root@$IP tar -czf - /tmp/artifacts | tar -C ${ARTIFACT_DIR} -xzf - set -e echo "### Done! (${rv})" -return $rv +exit $rv From a834d5d6e0c216fb4c97bfc052ab2256d9b3f894 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 4 Mar 2020 21:11:17 +0100 Subject: [PATCH 058/100] Fix for kubeconfig path configuration --- .../baremetalds/setup/baremetalds-setup-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 697e0ddde1000..23adb1de42c57 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -127,7 +127,7 @@ echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh -echo 'export KUBECONFIG=/root/dev-scripts/ocp/auth/kubeconfig' >> /root/.bashrc +echo 'export KUBECONFIG=/root/dev-scripts/ocp/ostest/auth/kubeconfig' >> /root/.bashrc if [ ! -e /opt/dev-scripts/pool ] ; then mkdir -p /opt/dev-scripts/pool From 24966b797dd5436d91c974640dfb461bd279aa91 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 5 Mar 2020 09:59:34 +0100 Subject: [PATCH 059/100] Run full conformance suite except storage tests --- .../baremetalds/e2e/test/baremetalds-e2e-test-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 55af6be18a2b2..c4a417b1653dc 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -38,7 +38,7 @@ scp $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin # Tests execution set +e echo "### Running tests" -ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep 'Area:Networking' \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - +ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep -v 'sig-storage' \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - rv=$? echo "### Fetching results" ssh $SSHOPTS root@$IP tar -czf - /tmp/artifacts | tar -C ${ARTIFACT_DIR} -xzf - From 3db0df36990d9122d3925d22e4d8cd05639b0dce Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 5 Mar 2020 11:41:53 +0100 Subject: [PATCH 060/100] Shellcheck fixes --- .../baremetalds/e2e/test/baremetalds-e2e-test-commands.sh | 3 ++- .../baremetalds/setup/baremetalds-setup-commands.sh | 4 +++- .../baremetalds/teardown/baremetalds-teardown-commands.sh | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index c4a417b1653dc..3206445102df6 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -8,7 +8,8 @@ cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey export SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${SSH_PRIV_KEY_PATH}" -export IP=$(cat ${SHARED_DIR}/packet-server-ip) +IP=$(cat ${SHARED_DIR}/packet-server-ip) +export IP echo "************ baremetalds test command ************" env | sort diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index 23adb1de42c57..ea1413ea80df9 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -15,7 +15,8 @@ export SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHost set +x export PACKET_PROJECT_ID=b3c1623c-ce0b-45cf-9757-c61a71e06eac -export PACKET_AUTH_TOKEN=$(cat ${cluster_profile}/.packetcred) +PACKET_AUTH_TOKEN=$(cat ${cluster_profile}/.packetcred) +export PACKET_AUTH_TOKEN set -x echo "************ baremetalds setup command ************" @@ -58,6 +59,7 @@ terraform init # example, `Oh snap, something went wrong! We've logged the error and will take a look - please reach out to us if you continue having trouble.` # therefore the terraform apply needs to be retried a few time before giving up. rc=1 +# shellcheck disable=SC2034 for r in {1..5}; do terraform apply -auto-approve && rc=0 && break ; done if test "${rc}" -eq 1; then echo >&2 "Failed to create packet server" diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 56b8f5b397131..977b92c1dce45 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -31,6 +31,7 @@ cp ${SHARED_DIR}/terraform.* ${terraform_home} echo "Deprovisioning cluster..." cd ${terraform_home} terraform init +# shellcheck disable=SC2034 for r in {1..5}; do terraform destroy -auto-approve && break ; done From 8968800cee1da4a20b90279a0356fa35cb7bacfc Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 5 Mar 2020 14:27:21 +0100 Subject: [PATCH 061/100] Missing shellcheck fixes --- .../baremetalds/setup/baremetalds-setup-commands.sh | 5 +++-- .../baremetalds/teardown/baremetalds-teardown-commands.sh | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh index ea1413ea80df9..2c5ec1bed172b 100644 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh @@ -59,7 +59,7 @@ terraform init # example, `Oh snap, something went wrong! We've logged the error and will take a look - please reach out to us if you continue having trouble.` # therefore the terraform apply needs to be retried a few time before giving up. rc=1 -# shellcheck disable=SC2034 +# shellcheck disable=SC20347 for r in {1..5}; do terraform apply -auto-approve && rc=0 && break ; done if test "${rc}" -eq 1; then echo >&2 "Failed to create packet server" @@ -79,7 +79,8 @@ jq -r '.modules[0].resources["packet_device.server"].primary.attributes.access_p cp /tmp/packet-server-ip ${secret_dir} # Fetch packet server IP -export IP=$(cat /tmp/packet-server-ip) +IP=$(cat /tmp/packet-server-ip) +export IP echo "Packet server IP is ${IP}" # Applying NSS fix for SSH connection diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh index 977b92c1dce45..1340ccb0e8bfe 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh @@ -9,7 +9,8 @@ export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey set +x export SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${SSH_PRIV_KEY_PATH}" -export PACKET_AUTH_TOKEN=$(cat ${cluster_profile}/.packetcred) +PACKET_AUTH_TOKEN=$(cat ${cluster_profile}/.packetcred) +export PACKET_AUTH_TOKEN set -x echo "************ baremetalds teardown command ************" From 98ff397d004385317b1d1d8e03cbab1acaed4ec4 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 5 Mar 2020 19:11:45 +0100 Subject: [PATCH 062/100] First draft for step split --- .../baremetalds/{setup => devscripts}/OWNERS | 0 .../{teardown => devscripts/setup}/OWNERS | 0 .../baremetalds-devscripts-setup-commands.sh | 110 ++++++++++++ .../baremetalds-devscripts-setup-ref.yaml | 10 ++ .../e2e/baremetalds-e2e-workflow.yaml | 8 +- .../e2e/test/baremetalds-e2e-test-commands.sh | 25 +-- .../e2e/test/baremetalds-e2e-test-ref.yaml | 2 +- .../step-registry/baremetalds/packet/OWNERS | 5 + .../baremetalds/packet/setup/OWNERS | 5 + .../baremetalds-packet-setup-commands.sh | 74 +++++++++ .../setup/baremetalds-packet-setup-ref.yaml | 12 ++ .../baremetalds/packet/teardown/OWNERS | 5 + .../baremetalds-packet-teardown-commands.sh} | 2 +- .../baremetalds-packet-teardown-ref.yaml} | 8 +- .../setup/baremetalds-setup-commands.sh | 156 ------------------ .../setup/baremetalds-setup-ref.yaml | 10 -- 16 files changed, 245 insertions(+), 187 deletions(-) rename ci-operator/step-registry/baremetalds/{setup => devscripts}/OWNERS (100%) rename ci-operator/step-registry/baremetalds/{teardown => devscripts/setup}/OWNERS (100%) create mode 100644 ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh create mode 100644 ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-ref.yaml create mode 100644 ci-operator/step-registry/baremetalds/packet/OWNERS create mode 100644 ci-operator/step-registry/baremetalds/packet/setup/OWNERS create mode 100644 ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh create mode 100644 ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-ref.yaml create mode 100644 ci-operator/step-registry/baremetalds/packet/teardown/OWNERS rename ci-operator/step-registry/baremetalds/{teardown/baremetalds-teardown-commands.sh => packet/teardown/baremetalds-packet-teardown-commands.sh} (93%) rename ci-operator/step-registry/baremetalds/{teardown/baremetalds-teardown-ref.yaml => packet/teardown/baremetalds-packet-teardown-ref.yaml} (51%) delete mode 100644 ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh delete mode 100644 ci-operator/step-registry/baremetalds/setup/baremetalds-setup-ref.yaml diff --git a/ci-operator/step-registry/baremetalds/setup/OWNERS b/ci-operator/step-registry/baremetalds/devscripts/OWNERS similarity index 100% rename from ci-operator/step-registry/baremetalds/setup/OWNERS rename to ci-operator/step-registry/baremetalds/devscripts/OWNERS diff --git a/ci-operator/step-registry/baremetalds/teardown/OWNERS b/ci-operator/step-registry/baremetalds/devscripts/setup/OWNERS similarity index 100% rename from ci-operator/step-registry/baremetalds/teardown/OWNERS rename to ci-operator/step-registry/baremetalds/devscripts/setup/OWNERS diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh new file mode 100644 index 0000000000000..f805dd9391fe4 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -0,0 +1,110 @@ +#!/bin/bash + +set -o nounset +set -o errexit +set -o pipefail + +cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile +secret_dir=/tmp/secret + +export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey +export PULL_SECRET_PATH=${cluster_profile}/pull-secret +export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${RELEASE_IMAGE_LATEST} +export CLUSTER_NAME=${NAMESPACE}-${JOB_NAME_HASH} +export SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${SSH_PRIV_KEY_PATH}" + +echo "************ baremetalds devscripts setup command ************" +env | sort + +# Initial check +if [ "${CLUSTER_TYPE}" != "packet" ] ; then + echo >&2 "Unsupported cluster type '${CLUSTER_TYPE}'" + exit 1 +fi + +echo "-------[ $SHARED_DIR ]" +ls -ll ${SHARED_DIR} + +# Fetch packet server IP +IP=$(cat ${SHARED_DIR}/server-ip) +export IP +echo "Packet server IP is ${IP}" + +# Applying NSS fix for SSH connection and share artifacts +if [ ! -d ${secret_dir} ]; then + echo "Making ${secret_dir}" + mkdir -p ${secret_dir} +fi + +echo "Copying nss artifacts to ${secret_dir}" +cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${secret_dir} + +export HOME=/tmp/nss_wrapper +mkdir -p $HOME +cp ${secret_dir}/libnss_wrapper.so ${HOME} +cp ${secret_dir}/mock-nss.sh ${HOME} +export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so +bash ${HOME}/mock-nss.sh + +# Checkout dev-scripts and make +for x in $(seq 10) ; do + test $x == 10 && exit 1 + ssh $SSHOPTS root@$IP hostname && break + sleep 10 +done + +scp $SSHOPTS ${PULL_SECRET_PATH} root@$IP:pull-secret +###### +# timeout -s 9 175m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g' + +# set -ex + +# yum install -y git + +# # python2-cryptography needs to come from delorean-master-testing, priority of packet.repo overrides it +# # remove the priority and instead ensure the packet repo is named first alphabetically +# # this way it is prefered but it isn't a hard override when newer versions are found elsewhere +# sed -i -e 's/priority.*//g' /etc/yum.repos.d/packet.repo +# sed -i -e 's/packet-/a_packet-/g' /etc/yum.repos.d/packet.repo + +# rm -rf /tmp/artifacts +# mkdir -p /tmp/artifacts + +# if [ ! -e dev-scripts ] ; then +# git clone https://github.com/openshift-metal3/dev-scripts.git +# fi +# cd dev-scripts + +# set +x +# echo "export PULL_SECRET='\$(cat /root/pull-secret)'" > /root/dev-scripts/config_root.sh +# set -x + +# curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - + +# echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-03-02-180524" >> /root/dev-scripts/config_root.sh +# echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh +# echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh +# echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh + +# echo 'export KUBECONFIG=/root/dev-scripts/ocp/ostest/auth/kubeconfig' >> /root/.bashrc + +# if [ ! -e /opt/dev-scripts/pool ] ; then +# mkdir -p /opt/dev-scripts/pool +# mount -t tmpfs -o size=100G tmpfs /opt/dev-scripts/pool +# fi + +# timeout -s 9 105m make + +# EOF + +# # Get dev-scripts logs +# echo "dev-scripts setup completed, fetching logs" +# ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - +# sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* +###### + + + + + + diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-ref.yaml b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-ref.yaml new file mode 100644 index 0000000000000..e75e48057307d --- /dev/null +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-ref.yaml @@ -0,0 +1,10 @@ +ref: + as: baremetalds-devscripts-setup + from: stable:libvirt-installer + commands: baremetalds-devscripts-setup-commands.sh + resources: + requests: + cpu: 1000m + memory: 500Mi + documentation: |- + Checkout and execute dev-scripts on a packet server diff --git a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml index 9e1a6ef102fa9..69e423ffafc59 100644 --- a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml +++ b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml @@ -2,11 +2,11 @@ workflow: as: baremetalds-e2e steps: pre: - - ref: baremetalds-nss-wrapper-hack - - ref: baremetalds-setup + - ref: baremetalds-packet-setup + - ref: baremetalds-devscrips-setup test: - ref: baremetalds-e2e-test post: - - ref: baremetalds-teardown + - ref: baremetalds-packet-teardown documentation: |- - The Baremetal DS E2E workflow executes the common end-to-end test suite on a cluster provisioned by running dev-scripts on a packet server. + This workflow executes the common end-to-end test suite on a cluster provisioned by running dev-scripts on a packet server. diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 3206445102df6..3dc244f66b737 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -8,8 +8,6 @@ cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey export SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${SSH_PRIV_KEY_PATH}" -IP=$(cat ${SHARED_DIR}/packet-server-ip) -export IP echo "************ baremetalds test command ************" env | sort @@ -23,6 +21,9 @@ fi echo "-------[ $SHARED_DIR ]" ls -ll ${SHARED_DIR} +IP=$(cat ${SHARED_DIR}/server-ip) +export IP + # Applying NSS fix for SSH connection echo "### Applying NSS fix" export HOME=/tmp/nss_wrapper @@ -36,15 +37,15 @@ bash ${HOME}/mock-nss.sh echo "### Copying test binaries" scp $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin -# Tests execution -set +e -echo "### Running tests" -ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep -v 'sig-storage' \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - -rv=$? -echo "### Fetching results" -ssh $SSHOPTS root@$IP tar -czf - /tmp/artifacts | tar -C ${ARTIFACT_DIR} -xzf - -set -e -echo "### Done! (${rv})" -exit $rv +# # Tests execution +# set +e +# echo "### Running tests" +# ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep -v 'sig-storage' \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - +# rv=$? +# echo "### Fetching results" +# ssh $SSHOPTS root@$IP tar -czf - /tmp/artifacts | tar -C ${ARTIFACT_DIR} -xzf - +# set -e +# echo "### Done! (${rv})" +# exit $rv diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-ref.yaml b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-ref.yaml index f54a8af5dd863..72d2789a63e99 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-ref.yaml +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-ref.yaml @@ -7,6 +7,6 @@ ref: cpu: "3" memory: 600Mi limits: - memory: 4Gi + memory: 2Gi documentation: |- The Baremtal DS E2E step executes the common end-to-end test suite. diff --git a/ci-operator/step-registry/baremetalds/packet/OWNERS b/ci-operator/step-registry/baremetalds/packet/OWNERS new file mode 100644 index 0000000000000..3ba207e71e301 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/packet/OWNERS @@ -0,0 +1,5 @@ +approvers: +- andfasano +- akiselev1 +- derekhiggins +- honza diff --git a/ci-operator/step-registry/baremetalds/packet/setup/OWNERS b/ci-operator/step-registry/baremetalds/packet/setup/OWNERS new file mode 100644 index 0000000000000..3ba207e71e301 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/packet/setup/OWNERS @@ -0,0 +1,5 @@ +approvers: +- andfasano +- akiselev1 +- derekhiggins +- honza diff --git a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh new file mode 100644 index 0000000000000..edde17ebd409b --- /dev/null +++ b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh @@ -0,0 +1,74 @@ +#!/bin/bash + +set -o nounset +set -o errexit +set -o pipefail + +cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile +secret_dir=/tmp/secret + +set +x +export PACKET_PROJECT_ID=b3c1623c-ce0b-45cf-9757-c61a71e06eac +PACKET_AUTH_TOKEN=$(cat ${cluster_profile}/.packetcred) +export PACKET_AUTH_TOKEN +set -x + +echo "************ baremetalds packet setup command ************" +env | sort + +# Initial check +if [ "${CLUSTER_TYPE}" != "packet" ] ; then + echo >&2 "Unsupported cluster type '${CLUSTER_TYPE}'" + exit 1 +fi + +echo "-------[ $SHARED_DIR ]" +ls -ll ${SHARED_DIR} + +# Terraform setup and init for packet server +terraform_home=${ARTIFACT_DIR}/terraform +mkdir -p ${terraform_home} +cd ${terraform_home} + +cat > ${terraform_home}/terraform.tf <<-EOF +provider "packet" { +} + +resource "packet_device" "server" { + count = "1" + project_id = "$PACKET_PROJECT_ID" + hostname = "ipi-$CLUSTER_NAME" + plan = "m2.xlarge.x86" + facilities = ["sjc1", "ewr1"] + operating_system = "centos_7" + billing_cycle = "hourly" +} +EOF + +terraform init + +# Packet returns transients errors when creating devices. +# example, `Oh snap, something went wrong! We've logged the error and will take a look - please reach out to us if you continue having trouble.` +# therefore the terraform apply needs to be retried a few time before giving up. +rc=1 +# shellcheck disable=SC20347 +for r in {1..5}; do terraform apply -auto-approve && rc=0 && break ; done +if test "${rc}" -eq 1; then + echo >&2 "Failed to create packet server" + exit 1 +fi + +# Sharing terraform artifacts required by teardown +if [ ! -d ${secret_dir} ]; then + echo "Making ${secret_dir}" + mkdir -p ${secret_dir} +fi + +cp ${terraform_home}/terraform.* ${secret_dir} + +# Sharing artifacts required by teardown +jq -r '.modules[0].resources["packet_device.server"].primary.attributes.access_public_ipv4' terraform.tfstate > /tmp/server-ip +cp /tmp/server-ip ${secret_dir} + + + diff --git a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-ref.yaml b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-ref.yaml new file mode 100644 index 0000000000000..c6b8a3f7fc3f2 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-ref.yaml @@ -0,0 +1,12 @@ +ref: + as: baremetalds-packet-setup + from: stable:upi-installer + commands: baremetalds-packet-setup-commands.sh + resources: + requests: + cpu: 1000m + memory: 600Mi + limits: + memory: 2Gi + documentation: |- + This step performs the setup of the packet server diff --git a/ci-operator/step-registry/baremetalds/packet/teardown/OWNERS b/ci-operator/step-registry/baremetalds/packet/teardown/OWNERS new file mode 100644 index 0000000000000..3ba207e71e301 --- /dev/null +++ b/ci-operator/step-registry/baremetalds/packet/teardown/OWNERS @@ -0,0 +1,5 @@ +approvers: +- andfasano +- akiselev1 +- derekhiggins +- honza diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh b/ci-operator/step-registry/baremetalds/packet/teardown/baremetalds-packet-teardown-commands.sh similarity index 93% rename from ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh rename to ci-operator/step-registry/baremetalds/packet/teardown/baremetalds-packet-teardown-commands.sh index 1340ccb0e8bfe..8b1782c8e5419 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-commands.sh +++ b/ci-operator/step-registry/baremetalds/packet/teardown/baremetalds-packet-teardown-commands.sh @@ -13,7 +13,7 @@ PACKET_AUTH_TOKEN=$(cat ${cluster_profile}/.packetcred) export PACKET_AUTH_TOKEN set -x -echo "************ baremetalds teardown command ************" +echo "************ baremetalds packet teardown command ************" env | sort # Initial check diff --git a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-ref.yaml b/ci-operator/step-registry/baremetalds/packet/teardown/baremetalds-packet-teardown-ref.yaml similarity index 51% rename from ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-ref.yaml rename to ci-operator/step-registry/baremetalds/packet/teardown/baremetalds-packet-teardown-ref.yaml index 18117896949bd..2533f83f50f2f 100644 --- a/ci-operator/step-registry/baremetalds/teardown/baremetalds-teardown-ref.yaml +++ b/ci-operator/step-registry/baremetalds/packet/teardown/baremetalds-packet-teardown-ref.yaml @@ -1,10 +1,12 @@ ref: - as: baremetalds-teardown + as: baremetalds-packet-teardown from: stable:upi-installer - commands: baremetalds-teardown-commands.sh + commands: baremetalds-packet-teardown-commands.sh resources: requests: cpu: 1000m - memory: 500Mi + memory: 600Mi + limits: + memory: 2Gi documentation: |- This step deprovisions the packet server diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh deleted file mode 100644 index 2c5ec1bed172b..0000000000000 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-commands.sh +++ /dev/null @@ -1,156 +0,0 @@ -#!/bin/bash - -set -o nounset -set -o errexit -set -o pipefail - -cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile -secret_dir=/tmp/secret - -export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey -export PULL_SECRET_PATH=${cluster_profile}/pull-secret -export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${RELEASE_IMAGE_LATEST} -export CLUSTER_NAME=${NAMESPACE}-${JOB_NAME_HASH} -export SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${SSH_PRIV_KEY_PATH}" - -set +x -export PACKET_PROJECT_ID=b3c1623c-ce0b-45cf-9757-c61a71e06eac -PACKET_AUTH_TOKEN=$(cat ${cluster_profile}/.packetcred) -export PACKET_AUTH_TOKEN -set -x - -echo "************ baremetalds setup command ************" -env | sort - -# Initial check -if [ "${CLUSTER_TYPE}" != "packet" ] ; then - echo >&2 "Unsupported cluster type '${CLUSTER_TYPE}'" - exit 1 -fi - -echo "-------[ $SHARED_DIR ]" -ls -ll ${SHARED_DIR} - -echo "Installing from release ${OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE}" - -# Terraform setup and init for packet server -terraform_home=${ARTIFACT_DIR}/terraform -mkdir -p ${terraform_home} -cd ${terraform_home} - -cat > ${terraform_home}/terraform.tf <<-EOF -provider "packet" { -} - -resource "packet_device" "server" { - count = "1" - project_id = "$PACKET_PROJECT_ID" - hostname = "ipi-$CLUSTER_NAME" - plan = "m2.xlarge.x86" - facilities = ["sjc1", "ewr1"] - operating_system = "centos_7" - billing_cycle = "hourly" -} -EOF - -terraform init - -# Packet returns transients errors when creating devices. -# example, `Oh snap, something went wrong! We've logged the error and will take a look - please reach out to us if you continue having trouble.` -# therefore the terraform apply needs to be retried a few time before giving up. -rc=1 -# shellcheck disable=SC20347 -for r in {1..5}; do terraform apply -auto-approve && rc=0 && break ; done -if test "${rc}" -eq 1; then - echo >&2 "Failed to create packet server" - exit 1 -fi - -# Sharing terraform artifacts required by teardown -if [ ! -d ${secret_dir} ]; then - echo "Making ${secret_dir}" - mkdir -p ${secret_dir} -fi - -cp ${terraform_home}/terraform.* ${secret_dir} - -# Sharing artifacts required by teardown -jq -r '.modules[0].resources["packet_device.server"].primary.attributes.access_public_ipv4' terraform.tfstate > /tmp/packet-server-ip -cp /tmp/packet-server-ip ${secret_dir} - -# Fetch packet server IP -IP=$(cat /tmp/packet-server-ip) -export IP -echo "Packet server IP is ${IP}" - -# Applying NSS fix for SSH connection -export HOME=/tmp/nss_wrapper -mkdir -p $HOME -cp ${SHARED_DIR}/libnss_wrapper.so ${HOME} -cp ${SHARED_DIR}/mock-nss.sh ${HOME} -export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so -bash ${HOME}/mock-nss.sh - -# Checkout dev-scripts and make -for x in $(seq 10) ; do - test $x == 10 && exit 1 - ssh $SSHOPTS root@$IP hostname && break - sleep 10 -done - -scp $SSHOPTS ${PULL_SECRET_PATH} root@$IP:pull-secret -timeout -s 9 175m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g' - -set -ex - -yum install -y git - -# python2-cryptography needs to come from delorean-master-testing, priority of packet.repo overrides it -# remove the priority and instead ensure the packet repo is named first alphabetically -# this way it is prefered but it isn't a hard override when newer versions are found elsewhere -sed -i -e 's/priority.*//g' /etc/yum.repos.d/packet.repo -sed -i -e 's/packet-/a_packet-/g' /etc/yum.repos.d/packet.repo - -rm -rf /tmp/artifacts -mkdir -p /tmp/artifacts - -if [ ! -e dev-scripts ] ; then - git clone https://github.com/openshift-metal3/dev-scripts.git -fi -cd dev-scripts - -set +x -echo "export PULL_SECRET='\$(cat /root/pull-secret)'" > /root/dev-scripts/config_root.sh -set -x - -curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - - -echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-03-02-180524" >> /root/dev-scripts/config_root.sh -echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh -echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh -echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh - -echo 'export KUBECONFIG=/root/dev-scripts/ocp/ostest/auth/kubeconfig' >> /root/.bashrc - -if [ ! -e /opt/dev-scripts/pool ] ; then - mkdir -p /opt/dev-scripts/pool - mount -t tmpfs -o size=100G tmpfs /opt/dev-scripts/pool -fi - -timeout -s 9 105m make - -EOF - -# Get dev-scripts logs -echo "dev-scripts setup completed, fetching logs" -ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - -sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* - -### Workaround due the sharing dir bug, to be removed once it will be fixed ### -echo "Copying nss artifacts to ${secret_dir}" -cp ${HOME}/mock-nss.sh ${HOME}/libnss_wrapper.so ${secret_dir} - - - - - diff --git a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-ref.yaml b/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-ref.yaml deleted file mode 100644 index 287723c546448..0000000000000 --- a/ci-operator/step-registry/baremetalds/setup/baremetalds-setup-ref.yaml +++ /dev/null @@ -1,10 +0,0 @@ -ref: - as: baremetalds-setup - from: stable:upi-installer - commands: baremetalds-setup-commands.sh - resources: - requests: - cpu: 1000m - memory: 500Mi - documentation: |- - This step performs the setup of the packet server that will host and execute dev-scripts From 50b12fc5eded2810cfc5fa3d07f7e726b701a70e Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 5 Mar 2020 19:22:24 +0100 Subject: [PATCH 063/100] Workflow typo fix --- .../step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml index 69e423ffafc59..6f587beb1af39 100644 --- a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml +++ b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml @@ -3,7 +3,7 @@ workflow: steps: pre: - ref: baremetalds-packet-setup - - ref: baremetalds-devscrips-setup + - ref: baremetalds-devscripts-setup test: - ref: baremetalds-e2e-test post: From 57cdf7313cbe24d51b745e38a7469bfd9f22ea51 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 5 Mar 2020 20:08:34 +0100 Subject: [PATCH 064/100] Fix CLUSTER_NAME export --- .../devscripts/setup/baremetalds-devscripts-setup-commands.sh | 1 - .../packet/setup/baremetalds-packet-setup-commands.sh | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index f805dd9391fe4..edb359bc64ed5 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -10,7 +10,6 @@ secret_dir=/tmp/secret export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey export PULL_SECRET_PATH=${cluster_profile}/pull-secret export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${RELEASE_IMAGE_LATEST} -export CLUSTER_NAME=${NAMESPACE}-${JOB_NAME_HASH} export SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${SSH_PRIV_KEY_PATH}" echo "************ baremetalds devscripts setup command ************" diff --git a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh index edde17ebd409b..3f032b6ed2fa0 100644 --- a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh @@ -7,6 +7,8 @@ set -o pipefail cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile secret_dir=/tmp/secret +export CLUSTER_NAME=${NAMESPACE}-${JOB_NAME_HASH} + set +x export PACKET_PROJECT_ID=b3c1623c-ce0b-45cf-9757-c61a71e06eac PACKET_AUTH_TOKEN=$(cat ${cluster_profile}/.packetcred) From 1fc21b8e410f6acf8c2ea224658da6a37b6ea8ce Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 6 Mar 2020 10:03:55 +0100 Subject: [PATCH 065/100] Retest packet setup --- .../baremetalds/e2e/baremetalds-e2e-workflow.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml index 6f587beb1af39..f676b4f44b89a 100644 --- a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml +++ b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml @@ -3,9 +3,9 @@ workflow: steps: pre: - ref: baremetalds-packet-setup - - ref: baremetalds-devscripts-setup - test: - - ref: baremetalds-e2e-test +# - ref: baremetalds-devscripts-setup +# test: +# - ref: baremetalds-e2e-test post: - ref: baremetalds-packet-teardown documentation: |- From 2ff284fea7e6f8dfc6692afeaaab7948f770952c Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 6 Mar 2020 10:48:26 +0100 Subject: [PATCH 066/100] Re-enable partial test and ds setup execution --- .../baremetalds/e2e/baremetalds-e2e-workflow.yaml | 6 +++--- .../packet/setup/baremetalds-packet-setup-commands.sh | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml index f676b4f44b89a..6f587beb1af39 100644 --- a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml +++ b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml @@ -3,9 +3,9 @@ workflow: steps: pre: - ref: baremetalds-packet-setup -# - ref: baremetalds-devscripts-setup -# test: -# - ref: baremetalds-e2e-test + - ref: baremetalds-devscripts-setup + test: + - ref: baremetalds-e2e-test post: - ref: baremetalds-packet-teardown documentation: |- diff --git a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh index 3f032b6ed2fa0..0ed73460a4427 100644 --- a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh @@ -24,9 +24,6 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then exit 1 fi -echo "-------[ $SHARED_DIR ]" -ls -ll ${SHARED_DIR} - # Terraform setup and init for packet server terraform_home=${ARTIFACT_DIR}/terraform mkdir -p ${terraform_home} From 4376f41bc5f051dbe1aed4f1d155cc24e2f7a816 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 6 Mar 2020 12:58:16 +0100 Subject: [PATCH 067/100] Apply temporary fix for the shared dir issue --- .../devscripts/setup/baremetalds-devscripts-setup-commands.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index edb359bc64ed5..fe679c1ef508d 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -35,6 +35,10 @@ if [ ! -d ${secret_dir} ]; then mkdir -p ${secret_dir} fi +### ### Apply temporary fix for the shared dir issue: re-copy all the current content in ARTIFACT_DIR to secret_dir to make it visible for the subsequent steps ### ### +cp ${ARTIFACT_DIR}/* ${secret_dir} +### ### + echo "Copying nss artifacts to ${secret_dir}" cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${secret_dir} From a54ec1db62d289470883c1ba2c2d54a7be4f9ff5 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 6 Mar 2020 14:51:19 +0100 Subject: [PATCH 068/100] Fixed wrong directory name --- .../devscripts/setup/baremetalds-devscripts-setup-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index fe679c1ef508d..c4cb5f03c1c96 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -36,7 +36,7 @@ if [ ! -d ${secret_dir} ]; then fi ### ### Apply temporary fix for the shared dir issue: re-copy all the current content in ARTIFACT_DIR to secret_dir to make it visible for the subsequent steps ### ### -cp ${ARTIFACT_DIR}/* ${secret_dir} +cp ${SHARED_DIR}/* ${secret_dir} ### ### echo "Copying nss artifacts to ${secret_dir}" From c6e6c1d52b6d7bbd8fcb35fa1c72fbe7211e9830 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 6 Mar 2020 18:22:12 +0100 Subject: [PATCH 069/100] Re-enable dev-scripts setup and test execution --- .../baremetalds-devscripts-setup-commands.sh | 70 +++++++++---------- .../e2e/test/baremetalds-e2e-test-commands.sh | 20 +++--- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index c4cb5f03c1c96..8e464f5560b99 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -57,54 +57,54 @@ for x in $(seq 10) ; do done scp $SSHOPTS ${PULL_SECRET_PATH} root@$IP:pull-secret -###### -# timeout -s 9 175m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g' -# set -ex +timeout -s 9 175m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g' -# yum install -y git +set -ex -# # python2-cryptography needs to come from delorean-master-testing, priority of packet.repo overrides it -# # remove the priority and instead ensure the packet repo is named first alphabetically -# # this way it is prefered but it isn't a hard override when newer versions are found elsewhere -# sed -i -e 's/priority.*//g' /etc/yum.repos.d/packet.repo -# sed -i -e 's/packet-/a_packet-/g' /etc/yum.repos.d/packet.repo +yum install -y git -# rm -rf /tmp/artifacts -# mkdir -p /tmp/artifacts +# python2-cryptography needs to come from delorean-master-testing, priority of packet.repo overrides it +# remove the priority and instead ensure the packet repo is named first alphabetically +# this way it is prefered but it isn't a hard override when newer versions are found elsewhere +sed -i -e 's/priority.*//g' /etc/yum.repos.d/packet.repo +sed -i -e 's/packet-/a_packet-/g' /etc/yum.repos.d/packet.repo -# if [ ! -e dev-scripts ] ; then -# git clone https://github.com/openshift-metal3/dev-scripts.git -# fi -# cd dev-scripts +rm -rf /tmp/artifacts +mkdir -p /tmp/artifacts -# set +x -# echo "export PULL_SECRET='\$(cat /root/pull-secret)'" > /root/dev-scripts/config_root.sh -# set -x +if [ ! -e dev-scripts ] ; then + git clone https://github.com/openshift-metal3/dev-scripts.git +fi +cd dev-scripts + +set +x +echo "export PULL_SECRET='\$(cat /root/pull-secret)'" > /root/dev-scripts/config_root.sh +set -x -# curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - +curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - -# echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-03-02-180524" >> /root/dev-scripts/config_root.sh -# echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh -# echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh -# echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-03-02-180524" >> /root/dev-scripts/config_root.sh +echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh +echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh -# echo 'export KUBECONFIG=/root/dev-scripts/ocp/ostest/auth/kubeconfig' >> /root/.bashrc +echo 'export KUBECONFIG=/root/dev-scripts/ocp/ostest/auth/kubeconfig' >> /root/.bashrc + +if [ ! -e /opt/dev-scripts/pool ] ; then + mkdir -p /opt/dev-scripts/pool + mount -t tmpfs -o size=100G tmpfs /opt/dev-scripts/pool +fi -# if [ ! -e /opt/dev-scripts/pool ] ; then -# mkdir -p /opt/dev-scripts/pool -# mount -t tmpfs -o size=100G tmpfs /opt/dev-scripts/pool -# fi +timeout -s 9 105m make -# timeout -s 9 105m make +EOF -# EOF +# Get dev-scripts logs +echo "dev-scripts setup completed, fetching logs" +ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - +sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* -# # Get dev-scripts logs -# echo "dev-scripts setup completed, fetching logs" -# ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - -# sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* -###### diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 3dc244f66b737..069c204621ce1 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -37,15 +37,15 @@ bash ${HOME}/mock-nss.sh echo "### Copying test binaries" scp $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin -# # Tests execution -# set +e -# echo "### Running tests" -# ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep -v 'sig-storage' \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - -# rv=$? -# echo "### Fetching results" -# ssh $SSHOPTS root@$IP tar -czf - /tmp/artifacts | tar -C ${ARTIFACT_DIR} -xzf - -# set -e -# echo "### Done! (${rv})" -# exit $rv +# Tests execution +set +e +echo "### Running tests" +ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep -v 'sig-storage' \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - +rv=$? +echo "### Fetching results" +ssh $SSHOPTS root@$IP tar -czf - /tmp/artifacts | tar -C ${ARTIFACT_DIR} -xzf - +set -e +echo "### Done! (${rv})" +exit $rv From 58a451555bca2471f7cd251b45b45ab2f3acf985 Mon Sep 17 00:00:00 2001 From: Andrew Kiselev Date: Mon, 9 Mar 2020 21:57:47 -0400 Subject: [PATCH 070/100] Added exclude test cases filter --- .../e2e/test/baremetalds-e2e-test-commands.sh | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 069c204621ce1..5c2603c0cb64c 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -37,10 +37,48 @@ bash ${HOME}/mock-nss.sh echo "### Copying test binaries" scp $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin +# List of exclude cases +read -d '' EXCL << EOF +sig-storage +custom build with buildah being created from new-build +docker build using a pull secret Building from a template +prune builds based on settings in the buildconfig +result image should have proper labels set +Image policy +deploymentconfigs adoption +Alerts +templateinstance readiness test +oc adm must-gather +capture build stages and durations +deploymentconfigs with multiple image change triggers +Managed cluster should +forcePull should affect pulling builder images +s2i build with a root user image +Networking Granular Checks: Services +Image layer subresource +openshift mongodb image creating from a template +capture build stages and durations +process valueFrom in build strategy environment variables +result image should have proper labels set S2I build from a template +oc new-app +Image append +oc tag +forcePull should affect pulling builder images +templateinstance readiness test +Multi-stage image builds +Image extract +TestDockercfgTokenDeletedController +process valueFrom in build strategy environment variables +Prometheus when installed on the cluster +build can reference a cluster service with a build being created from new-build +deploymentconfigs with multiple image change triggers +deploymentconfigs should respect image stream tag reference policy +EOF + # Tests execution set +e echo "### Running tests" -ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep -v 'sig-storage' \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - +ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep -Fvf <(echo "$EXCL") \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - rv=$? echo "### Fetching results" ssh $SSHOPTS root@$IP tar -czf - /tmp/artifacts | tar -C ${ARTIFACT_DIR} -xzf - From 2e49a27ff666b8367047fcc5ae19495b4f20935f Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Tue, 10 Mar 2020 09:52:41 +0100 Subject: [PATCH 071/100] Deleted unused step --- .../step-registry/baremetalds/nss/OWNERS | 5 ---- .../baremetalds/nss/wrapper/OWNERS | 5 ---- .../baremetalds/nss/wrapper/hack/OWNERS | 5 ---- .../baremetalds-nss-wrapper-hack-commands.sh | 29 ------------------- .../baremetalds-nss-wrapper-hack-ref.yaml | 10 ------- 5 files changed, 54 deletions(-) delete mode 100644 ci-operator/step-registry/baremetalds/nss/OWNERS delete mode 100644 ci-operator/step-registry/baremetalds/nss/wrapper/OWNERS delete mode 100644 ci-operator/step-registry/baremetalds/nss/wrapper/hack/OWNERS delete mode 100755 ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh delete mode 100644 ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-ref.yaml diff --git a/ci-operator/step-registry/baremetalds/nss/OWNERS b/ci-operator/step-registry/baremetalds/nss/OWNERS deleted file mode 100644 index 3ba207e71e301..0000000000000 --- a/ci-operator/step-registry/baremetalds/nss/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ -approvers: -- andfasano -- akiselev1 -- derekhiggins -- honza diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/OWNERS b/ci-operator/step-registry/baremetalds/nss/wrapper/OWNERS deleted file mode 100644 index 3ba207e71e301..0000000000000 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ -approvers: -- andfasano -- akiselev1 -- derekhiggins -- honza diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/OWNERS b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/OWNERS deleted file mode 100644 index 3ba207e71e301..0000000000000 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ -approvers: -- andfasano -- akiselev1 -- derekhiggins -- honza diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh deleted file mode 100755 index 7bb4b651f8c10..0000000000000 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-commands.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -set -o nounset -set -o errexit -set -o pipefail - -echo "************ baremetalds nss wrapper hack command "************ -env | sort - -# Initial check -if [ "${CLUSTER_TYPE}" != "packet" ] ; then - echo >&2 "Unsupported cluster type '${CLUSTER_TYPE}'" - exit 0 -fi - -dir=/tmp/secret - -if [ ! -d ${dir} ]; then - echo "Making ${dir}" - mkdir -p ${dir} -fi - -echo "Copying nss artifacts to ${dir}" -cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${dir} - - - - - diff --git a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-ref.yaml b/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-ref.yaml deleted file mode 100644 index 5d4347245af02..0000000000000 --- a/ci-operator/step-registry/baremetalds/nss/wrapper/hack/baremetalds-nss-wrapper-hack-ref.yaml +++ /dev/null @@ -1,10 +0,0 @@ -ref: - as: baremetalds-nss-wrapper-hack - from: stable:libvirt-installer - commands: baremetalds-nss-wrapper-hack-commands.sh - resources: - requests: - cpu: 1000m - memory: 100Mi - documentation: |- - This step is required since libnns_wrapper is needed to use ssh in packet server From 4047fe1e298436969f7f58ee5ad84d61ad441462 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Tue, 10 Mar 2020 10:02:03 +0100 Subject: [PATCH 072/100] Add tests filter --- .../e2e/test/baremetalds-e2e-test-commands.sh | 41 ++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 069c204621ce1..d0077f5b4e079 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -37,11 +37,50 @@ bash ${HOME}/mock-nss.sh echo "### Copying test binaries" scp $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin +# List of exclude cases +read -d '' EXCL << EOF +sig-storage +custom build with buildah being created from new-build +docker build using a pull secret Building from a template +prune builds based on settings in the buildconfig +result image should have proper labels set +Image policy +deploymentconfigs adoption +Alerts +templateinstance readiness test +oc adm must-gather +capture build stages and durations +deploymentconfigs with multiple image change triggers +Managed cluster should +forcePull should affect pulling builder images +s2i build with a root user image +Networking Granular Checks: Services +Image layer subresource +openshift mongodb image creating from a template +capture build stages and durations +process valueFrom in build strategy environment variables +result image should have proper labels set S2I build from a template +oc new-app +Image append +oc tag +forcePull should affect pulling builder images +templateinstance readiness test +Multi-stage image builds +Image extract +TestDockercfgTokenDeletedController +process valueFrom in build strategy environment variables +Prometheus when installed on the cluster +build can reference a cluster service with a build being created from new-build +deploymentconfigs with multiple image change triggers +deploymentconfigs should respect image stream tag reference policy +EOF + # Tests execution set +e echo "### Running tests" -ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep -v 'sig-storage' \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - +ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep -Fvf <(echo "$EXCL") \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - rv=$? + echo "### Fetching results" ssh $SSHOPTS root@$IP tar -czf - /tmp/artifacts | tar -C ${ARTIFACT_DIR} -xzf - set -e From ce7f364c91cefbd7cbb1c8af2393119ad9b3961a Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Tue, 10 Mar 2020 10:02:48 +0100 Subject: [PATCH 073/100] Remove unused commands --- .../config/openshift/installer/openshift-installer-master.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml index a4e402be14fa0..c311874eb5ef4 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml @@ -200,7 +200,6 @@ tests: cluster_profile: aws workflow: origin-e2e - as: e2e-baremetalds - commands: "" steps: cluster_profile: packet workflow: baremetalds-e2e \ No newline at end of file From 8ea23efcb1fe23deb41d821e227adac217f263d7 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Tue, 10 Mar 2020 10:10:52 +0100 Subject: [PATCH 074/100] Add job config --- .../installer/openshift-installer-master-presubmits.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml index a56362637d1a1..5824c754cc4dc 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml @@ -1158,6 +1158,8 @@ presubmits: command: - ci-operator env: + - name: CLUSTER_PROVIDER + value: packet - name: CONFIG_SPEC valueFrom: configMapKeyRef: From 5d8e6f5a6af4f46c4cd741ca375cda997952728a Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Tue, 10 Mar 2020 11:12:02 +0100 Subject: [PATCH 075/100] Change release version, removed unused env var --- .../installer/openshift-installer-master-presubmits.yaml | 2 -- .../devscripts/setup/baremetalds-devscripts-setup-commands.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml index 5824c754cc4dc..a56362637d1a1 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml @@ -1158,8 +1158,6 @@ presubmits: command: - ci-operator env: - - name: CLUSTER_PROVIDER - value: packet - name: CONFIG_SPEC valueFrom: configMapKeyRef: diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index 8e464f5560b99..7fcd87bf6c472 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -84,7 +84,7 @@ set -x curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - -echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-03-02-180524" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-03-10-002851" >> /root/dev-scripts/config_root.sh echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh From d226dc157c852b7aa3cf62b04b4ac51dae366d95 Mon Sep 17 00:00:00 2001 From: Andrew Kiselev Date: Tue, 10 Mar 2020 13:13:33 -0400 Subject: [PATCH 076/100] Changed OPENSHIFT_RELEASE_IMAGE value to 4.4.0-0.nightly-2020-03-09-234759 --- .../devscripts/setup/baremetalds-devscripts-setup-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index 8e464f5560b99..44b9ae0c8ddca 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -84,7 +84,7 @@ set -x curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - -echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-03-02-180524" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-03-09-234759" >> /root/dev-scripts/config_root.sh echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh From e60f75c59e6c329089f2da8050aadba0cb555ce4 Mon Sep 17 00:00:00 2001 From: Andrew Kiselev Date: Tue, 10 Mar 2020 16:15:32 -0400 Subject: [PATCH 077/100] Changed OPENSHIFT_RELEASE_IMAGE value to 4.4.0-0.nightly-2020-03-10-165601 --- .../devscripts/setup/baremetalds-devscripts-setup-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index 44b9ae0c8ddca..79152ec9d84d0 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -84,7 +84,7 @@ set -x curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - -echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-03-09-234759" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-03-10-165601" >> /root/dev-scripts/config_root.sh echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh From 9bf66fd3f7fc1ca2f77659c0149ba6f621a9d063 Mon Sep 17 00:00:00 2001 From: Andrew Kiselev Date: Tue, 10 Mar 2020 18:57:47 -0400 Subject: [PATCH 078/100] Changed OPENSHIFT_RELEASE_IMAGE value to 4.5.0-0.nightly-2020-03-10-172025 --- .../devscripts/setup/baremetalds-devscripts-setup-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index 79152ec9d84d0..4554bda051187 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -84,7 +84,7 @@ set -x curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - -echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-03-10-165601" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.5.0-0.nightly-2020-03-10-172025" >> /root/dev-scripts/config_root.sh echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh From bfebf81ee0cd13a011eec708ba5a04a7e1fe5d89 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 11 Mar 2020 10:12:35 +0100 Subject: [PATCH 079/100] Use of RELEASE_IMAGE_LATEST in dev-scrpts --- .../devscripts/setup/baremetalds-devscripts-setup-commands.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index 7fcd87bf6c472..b5241558136fd 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -9,7 +9,6 @@ secret_dir=/tmp/secret export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey export PULL_SECRET_PATH=${cluster_profile}/pull-secret -export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=${RELEASE_IMAGE_LATEST} export SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${SSH_PRIV_KEY_PATH}" echo "************ baremetalds devscripts setup command ************" @@ -84,7 +83,7 @@ set -x curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - -echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.4.0-0.nightly-2020-03-10-002851" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_RELEASE_IMAGE=${RELEASE_IMAGE_LATEST}" >> /root/dev-scripts/config_root.sh echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh From 06b3c81a42a031ae4054e131960cf88431f18f11 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 11 Mar 2020 11:43:43 +0100 Subject: [PATCH 080/100] Fetch dev-scripts logs always --- .../baremetalds-devscripts-setup-commands.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index b5241558136fd..fa145597828e6 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -55,6 +55,19 @@ for x in $(seq 10) ; do sleep 10 done +# Get dev-scripts logs +finished() +{ + set +e + + # Get dev-scripts logs + echo "dev-scripts setup completed, fetching logs" + ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - + sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* +} +trap finished EXIT TERM + +# Prepare configuration and run dev-scripts scp $SSHOPTS ${PULL_SECRET_PATH} root@$IP:pull-secret timeout -s 9 175m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g' @@ -99,11 +112,6 @@ timeout -s 9 105m make EOF -# Get dev-scripts logs -echo "dev-scripts setup completed, fetching logs" -ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - -sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* - From 476bcd217d35e43361c376aa4cc629e0ff532286 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 11 Mar 2020 11:46:54 +0100 Subject: [PATCH 081/100] Add pub keys for debugging --- .../setup/baremetalds-devscripts-setup-commands.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index fa145597828e6..e19692a4ff925 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -74,6 +74,11 @@ timeout -s 9 175m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** set -ex +#### For debug only, to be removed #### +curl https://github.com/derekhiggins.keys >> /root/.ssh/authorized_keys +curl https://github.com/andfasano.keys >> /root/.ssh/authorized_keys +####################################### + yum install -y git # python2-cryptography needs to come from delorean-master-testing, priority of packet.repo overrides it From 3c05f674172cb47f000fd4387c773202cb6f6a38 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 11 Mar 2020 13:46:21 +0100 Subject: [PATCH 082/100] Configure OPENSHIFT_RELEASE_IMAGE to use latest image available from current NAMESPACE --- .../devscripts/setup/baremetalds-devscripts-setup-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index e19692a4ff925..c991810fc2d10 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -101,7 +101,7 @@ set -x curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - -echo "export OPENSHIFT_RELEASE_IMAGE=${RELEASE_IMAGE_LATEST}" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/${NAMESPACE}/release:latest" >> /root/dev-scripts/config_root.sh echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh From 7e685ee69d48df779265bb4d5e3aa990c8f1a08b Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 11 Mar 2020 16:41:59 +0100 Subject: [PATCH 083/100] Enable Centos8l and use of 4.5.0-0.ci-2020-03-11-134608 release version --- .../setup/baremetalds-devscripts-setup-commands.sh | 7 +------ .../packet/setup/baremetalds-packet-setup-commands.sh | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index c991810fc2d10..88625b0080d1c 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -74,11 +74,6 @@ timeout -s 9 175m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** set -ex -#### For debug only, to be removed #### -curl https://github.com/derekhiggins.keys >> /root/.ssh/authorized_keys -curl https://github.com/andfasano.keys >> /root/.ssh/authorized_keys -####################################### - yum install -y git # python2-cryptography needs to come from delorean-master-testing, priority of packet.repo overrides it @@ -101,7 +96,7 @@ set -x curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - -echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/${NAMESPACE}/release:latest" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.5.0-0.ci-2020-03-11-134608" >> /root/dev-scripts/config_root.sh echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh diff --git a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh index 0ed73460a4427..fc0fa5399a90b 100644 --- a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh @@ -39,7 +39,7 @@ resource "packet_device" "server" { hostname = "ipi-$CLUSTER_NAME" plan = "m2.xlarge.x86" facilities = ["sjc1", "ewr1"] - operating_system = "centos_7" + operating_system = "centos_8" billing_cycle = "hourly" } EOF From 9fb99a0851bce11b2f6755823b0465c0f9dd6ce3 Mon Sep 17 00:00:00 2001 From: Andrew Kiselev Date: Wed, 11 Mar 2020 11:52:51 -0400 Subject: [PATCH 084/100] Changed operating_system to centos_8 --- .../packet/setup/baremetalds-packet-setup-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh index 0ed73460a4427..fc0fa5399a90b 100644 --- a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh @@ -39,7 +39,7 @@ resource "packet_device" "server" { hostname = "ipi-$CLUSTER_NAME" plan = "m2.xlarge.x86" facilities = ["sjc1", "ewr1"] - operating_system = "centos_7" + operating_system = "centos_8" billing_cycle = "hourly" } EOF From 56ff38de56c6f0997ba3f1fae3cdae02303a5ce2 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Wed, 11 Mar 2020 17:24:24 +0100 Subject: [PATCH 085/100] Remove packet.repo hack --- .../devscripts/setup/baremetalds-devscripts-setup-commands.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index 88625b0080d1c..496691ca5d723 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -79,8 +79,8 @@ yum install -y git # python2-cryptography needs to come from delorean-master-testing, priority of packet.repo overrides it # remove the priority and instead ensure the packet repo is named first alphabetically # this way it is prefered but it isn't a hard override when newer versions are found elsewhere -sed -i -e 's/priority.*//g' /etc/yum.repos.d/packet.repo -sed -i -e 's/packet-/a_packet-/g' /etc/yum.repos.d/packet.repo +### sed -i -e 's/priority.*//g' /etc/yum.repos.d/packet.repo +### sed -i -e 's/packet-/a_packet-/g' /etc/yum.repos.d/packet.repo rm -rf /tmp/artifacts mkdir -p /tmp/artifacts From 16c27fb22b1cb2a2554636d576fba68c536a7c20 Mon Sep 17 00:00:00 2001 From: Andrew Kiselev Date: Wed, 11 Mar 2020 18:14:08 -0400 Subject: [PATCH 086/100] Changed OPENSHIFT_RELEASE_IMAGE value to latest --- .../devscripts/setup/baremetalds-devscripts-setup-commands.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index d6abd0b7c8e7e..b6cbe03d78f63 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -102,8 +102,8 @@ set -x curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - -echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.5.0-0.ci-2020-03-11-134608" >> /root/dev-scripts/config_root.sh -#echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/${NAMESPACE}/release:latest" >> /root/dev-scripts/config_root.sh +#echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.5.0-0.ci-2020-03-11-134608" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/${NAMESPACE}/release:latest" >> /root/dev-scripts/config_root.sh echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh From a11ba7a58f0f05bd13043efa2d24ac48fb280366 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 12 Mar 2020 11:49:18 +0100 Subject: [PATCH 087/100] Troubleshoot e2e-test failure --- .../baremetalds-devscripts-setup-commands.sh | 94 +++++++++---------- .../e2e/test/baremetalds-e2e-test-commands.sh | 26 ++--- 2 files changed, 62 insertions(+), 58 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index 496691ca5d723..6e35368595037 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -48,69 +48,69 @@ cp ${secret_dir}/mock-nss.sh ${HOME} export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so bash ${HOME}/mock-nss.sh -# Checkout dev-scripts and make -for x in $(seq 10) ; do - test $x == 10 && exit 1 - ssh $SSHOPTS root@$IP hostname && break - sleep 10 -done +# # Checkout dev-scripts and make +# for x in $(seq 10) ; do +# test $x == 10 && exit 1 +# ssh $SSHOPTS root@$IP hostname && break +# sleep 10 +# done -# Get dev-scripts logs -finished() -{ - set +e +# # Get dev-scripts logs +# finished() +# { +# set +e - # Get dev-scripts logs - echo "dev-scripts setup completed, fetching logs" - ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - - sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* -} -trap finished EXIT TERM +# # Get dev-scripts logs +# echo "dev-scripts setup completed, fetching logs" +# ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - +# sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* +# } +# trap finished EXIT TERM -# Prepare configuration and run dev-scripts -scp $SSHOPTS ${PULL_SECRET_PATH} root@$IP:pull-secret +# # Prepare configuration and run dev-scripts +# scp $SSHOPTS ${PULL_SECRET_PATH} root@$IP:pull-secret -timeout -s 9 175m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g' +# timeout -s 9 175m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g' -set -ex +# set -ex -yum install -y git +# yum install -y git -# python2-cryptography needs to come from delorean-master-testing, priority of packet.repo overrides it -# remove the priority and instead ensure the packet repo is named first alphabetically -# this way it is prefered but it isn't a hard override when newer versions are found elsewhere -### sed -i -e 's/priority.*//g' /etc/yum.repos.d/packet.repo -### sed -i -e 's/packet-/a_packet-/g' /etc/yum.repos.d/packet.repo +# # python2-cryptography needs to come from delorean-master-testing, priority of packet.repo overrides it +# # remove the priority and instead ensure the packet repo is named first alphabetically +# # this way it is prefered but it isn't a hard override when newer versions are found elsewhere +# ### sed -i -e 's/priority.*//g' /etc/yum.repos.d/packet.repo +# ### sed -i -e 's/packet-/a_packet-/g' /etc/yum.repos.d/packet.repo -rm -rf /tmp/artifacts -mkdir -p /tmp/artifacts +# rm -rf /tmp/artifacts +# mkdir -p /tmp/artifacts -if [ ! -e dev-scripts ] ; then - git clone https://github.com/openshift-metal3/dev-scripts.git -fi -cd dev-scripts +# if [ ! -e dev-scripts ] ; then +# git clone https://github.com/openshift-metal3/dev-scripts.git +# fi +# cd dev-scripts -set +x -echo "export PULL_SECRET='\$(cat /root/pull-secret)'" > /root/dev-scripts/config_root.sh -set -x +# set +x +# echo "export PULL_SECRET='\$(cat /root/pull-secret)'" > /root/dev-scripts/config_root.sh +# set -x -curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - +# curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - -echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.5.0-0.ci-2020-03-11-134608" >> /root/dev-scripts/config_root.sh -echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh -echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh -echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh +# echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.5.0-0.ci-2020-03-11-134608" >> /root/dev-scripts/config_root.sh +# echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh +# echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh +# echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh -echo 'export KUBECONFIG=/root/dev-scripts/ocp/ostest/auth/kubeconfig' >> /root/.bashrc +# echo 'export KUBECONFIG=/root/dev-scripts/ocp/ostest/auth/kubeconfig' >> /root/.bashrc -if [ ! -e /opt/dev-scripts/pool ] ; then - mkdir -p /opt/dev-scripts/pool - mount -t tmpfs -o size=100G tmpfs /opt/dev-scripts/pool -fi +# if [ ! -e /opt/dev-scripts/pool ] ; then +# mkdir -p /opt/dev-scripts/pool +# mount -t tmpfs -o size=100G tmpfs /opt/dev-scripts/pool +# fi -timeout -s 9 105m make +# timeout -s 9 105m make -EOF +# EOF diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index d0077f5b4e079..b55408bfff105 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -33,11 +33,15 @@ cp ${SHARED_DIR}/mock-nss.sh ${HOME} export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so bash ${HOME}/mock-nss.sh +echo "Show /usr/bin content" +ls -ll /usr/bin/o* /usr/bin/k* + # Copy test binaries on packet server echo "### Copying test binaries" -scp $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin +scp -v $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin # List of exclude cases +echo "### Preparing filter" read -d '' EXCL << EOF sig-storage custom build with buildah being created from new-build @@ -75,16 +79,16 @@ deploymentconfigs with multiple image change triggers deploymentconfigs should respect image stream tag reference policy EOF -# Tests execution -set +e -echo "### Running tests" -ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep -Fvf <(echo "$EXCL") \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - -rv=$? +# # Tests execution +# set +e +# echo "### Running tests" +# ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep -Fvf <(echo "$EXCL") \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - +# rv=$? -echo "### Fetching results" -ssh $SSHOPTS root@$IP tar -czf - /tmp/artifacts | tar -C ${ARTIFACT_DIR} -xzf - -set -e -echo "### Done! (${rv})" -exit $rv +# echo "### Fetching results" +# ssh $SSHOPTS root@$IP tar -czf - /tmp/artifacts | tar -C ${ARTIFACT_DIR} -xzf - +# set -e +# echo "### Done! (${rv})" +# exit $rv From 6ab50a4f11f576b55d2cd202d009cb23d6ccc1d3 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 12 Mar 2020 16:07:47 +0100 Subject: [PATCH 088/100] Changes for unified SHARED_DIR --- .../baremetalds-devscripts-setup-commands.sh | 24 +++++++++---------- .../baremetalds-packet-setup-commands.sh | 16 ++++++------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index 6e35368595037..654df7872cabc 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -5,7 +5,7 @@ set -o errexit set -o pipefail cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile -secret_dir=/tmp/secret +#### secret_dir=/tmp/secret export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey export PULL_SECRET_PATH=${cluster_profile}/pull-secret @@ -29,22 +29,22 @@ export IP echo "Packet server IP is ${IP}" # Applying NSS fix for SSH connection and share artifacts -if [ ! -d ${secret_dir} ]; then - echo "Making ${secret_dir}" - mkdir -p ${secret_dir} -fi +#### if [ ! -d ${secret_dir} ]; then +#### echo "Making ${secret_dir}" +#### mkdir -p ${secret_dir} +#### fi -### ### Apply temporary fix for the shared dir issue: re-copy all the current content in ARTIFACT_DIR to secret_dir to make it visible for the subsequent steps ### ### -cp ${SHARED_DIR}/* ${secret_dir} -### ### +#### ### ### Apply temporary fix for the shared dir issue: re-copy all the current content in ARTIFACT_DIR to secret_dir to make it visible for the subsequent steps ### ### +#### cp ${SHARED_DIR}/* ${secret_dir} +#### ### ### -echo "Copying nss artifacts to ${secret_dir}" -cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${secret_dir} +echo "Copying nss artifacts to ${SHARED_DIR}" +cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${SHARED_DIR} export HOME=/tmp/nss_wrapper mkdir -p $HOME -cp ${secret_dir}/libnss_wrapper.so ${HOME} -cp ${secret_dir}/mock-nss.sh ${HOME} +cp /usr/lib64/libnss_wrapper.so ${HOME} +cp /bin/mock-nss.sh ${HOME} export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so bash ${HOME}/mock-nss.sh diff --git a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh index fc0fa5399a90b..897fdf7cce221 100644 --- a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh @@ -5,7 +5,7 @@ set -o errexit set -o pipefail cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile -secret_dir=/tmp/secret +#### secret_dir=/tmp/secret export CLUSTER_NAME=${NAMESPACE}-${JOB_NAME_HASH} @@ -57,17 +57,17 @@ if test "${rc}" -eq 1; then exit 1 fi -# Sharing terraform artifacts required by teardown -if [ ! -d ${secret_dir} ]; then - echo "Making ${secret_dir}" - mkdir -p ${secret_dir} -fi +#### # Sharing terraform artifacts required by teardown +#### if [ ! -d ${secret_dir} ]; then +#### echo "Making ${secret_dir}" +#### mkdir -p ${secret_dir} +#### fi -cp ${terraform_home}/terraform.* ${secret_dir} +cp ${terraform_home}/terraform.* ${SHARED_DIR} # Sharing artifacts required by teardown jq -r '.modules[0].resources["packet_device.server"].primary.attributes.access_public_ipv4' terraform.tfstate > /tmp/server-ip -cp /tmp/server-ip ${secret_dir} +cp /tmp/server-ip ${SHARED_DIR} From a7c8c96f37aa2b4dee08e497ab5e1d50661827be Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 12 Mar 2020 18:23:05 +0100 Subject: [PATCH 089/100] Fix for read command. Re-enable dev-scripts setup --- .../baremetalds-devscripts-setup-commands.sh | 89 +++++++++---------- .../e2e/test/baremetalds-e2e-test-commands.sh | 3 +- 2 files changed, 43 insertions(+), 49 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index 654df7872cabc..7e6c8c104ff1e 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -48,69 +48,62 @@ cp /bin/mock-nss.sh ${HOME} export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so bash ${HOME}/mock-nss.sh -# # Checkout dev-scripts and make -# for x in $(seq 10) ; do -# test $x == 10 && exit 1 -# ssh $SSHOPTS root@$IP hostname && break -# sleep 10 -# done +# Checkout dev-scripts and make +for x in $(seq 10) ; do + test $x == 10 && exit 1 + ssh $SSHOPTS root@$IP hostname && break + sleep 10 +done -# # Get dev-scripts logs -# finished() -# { -# set +e +# Get dev-scripts logs +finished() +{ + set +e -# # Get dev-scripts logs -# echo "dev-scripts setup completed, fetching logs" -# ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - -# sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* -# } -# trap finished EXIT TERM + # Get dev-scripts logs + echo "dev-scripts setup completed, fetching logs" + ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf - + sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/* +} +trap finished EXIT TERM -# # Prepare configuration and run dev-scripts -# scp $SSHOPTS ${PULL_SECRET_PATH} root@$IP:pull-secret +# Prepare configuration and run dev-scripts +scp $SSHOPTS ${PULL_SECRET_PATH} root@$IP:pull-secret -# timeout -s 9 175m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g' +timeout -s 9 175m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g' -# set -ex +set -ex -# yum install -y git +yum install -y git -# # python2-cryptography needs to come from delorean-master-testing, priority of packet.repo overrides it -# # remove the priority and instead ensure the packet repo is named first alphabetically -# # this way it is prefered but it isn't a hard override when newer versions are found elsewhere -# ### sed -i -e 's/priority.*//g' /etc/yum.repos.d/packet.repo -# ### sed -i -e 's/packet-/a_packet-/g' /etc/yum.repos.d/packet.repo +mkdir -p /tmp/artifacts -# rm -rf /tmp/artifacts -# mkdir -p /tmp/artifacts - -# if [ ! -e dev-scripts ] ; then -# git clone https://github.com/openshift-metal3/dev-scripts.git -# fi -# cd dev-scripts +if [ ! -e dev-scripts ] ; then + git clone https://github.com/openshift-metal3/dev-scripts.git +fi +cd dev-scripts -# set +x -# echo "export PULL_SECRET='\$(cat /root/pull-secret)'" > /root/dev-scripts/config_root.sh -# set -x +set +x +echo "export PULL_SECRET='\$(cat /root/pull-secret)'" > /root/dev-scripts/config_root.sh +set -x -# curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - +curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - -# echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.5.0-0.ci-2020-03-11-134608" >> /root/dev-scripts/config_root.sh -# echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh -# echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh -# echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.5.0-0.ci-2020-03-11-134608" >> /root/dev-scripts/config_root.sh +echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh +echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh -# echo 'export KUBECONFIG=/root/dev-scripts/ocp/ostest/auth/kubeconfig' >> /root/.bashrc +echo 'export KUBECONFIG=/root/dev-scripts/ocp/ostest/auth/kubeconfig' >> /root/.bashrc -# if [ ! -e /opt/dev-scripts/pool ] ; then -# mkdir -p /opt/dev-scripts/pool -# mount -t tmpfs -o size=100G tmpfs /opt/dev-scripts/pool -# fi +if [ ! -e /opt/dev-scripts/pool ] ; then + mkdir -p /opt/dev-scripts/pool + mount -t tmpfs -o size=100G tmpfs /opt/dev-scripts/pool +fi -# timeout -s 9 105m make +timeout -s 9 105m make -# EOF +EOF diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index b55408bfff105..b92075b8f2862 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -42,7 +42,7 @@ scp -v $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bi # List of exclude cases echo "### Preparing filter" -read -d '' EXCL << EOF +read -d '*' EXCL << EOF sig-storage custom build with buildah being created from new-build docker build using a pull secret Building from a template @@ -77,6 +77,7 @@ Prometheus when installed on the cluster build can reference a cluster service with a build being created from new-build deploymentconfigs with multiple image change triggers deploymentconfigs should respect image stream tag reference policy +* EOF # # Tests execution From e3eb172de865c0e5bf2fc8533bf23a1d97f5fb1c Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Thu, 12 Mar 2020 21:10:59 +0100 Subject: [PATCH 090/100] Re-activate tests execution --- .../e2e/test/baremetalds-e2e-test-commands.sh | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index b92075b8f2862..a2fe93abf7bbf 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -33,12 +33,9 @@ cp ${SHARED_DIR}/mock-nss.sh ${HOME} export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so bash ${HOME}/mock-nss.sh -echo "Show /usr/bin content" -ls -ll /usr/bin/o* /usr/bin/k* - # Copy test binaries on packet server echo "### Copying test binaries" -scp -v $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin +scp $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin # List of exclude cases echo "### Preparing filter" @@ -80,16 +77,16 @@ deploymentconfigs should respect image stream tag reference policy * EOF -# # Tests execution -# set +e -# echo "### Running tests" -# ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep -Fvf <(echo "$EXCL") \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - -# rv=$? +# Tests execution +set +e +echo "### Running tests" +ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep -Fvf <(echo "$EXCL") \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - +rv=$? -# echo "### Fetching results" -# ssh $SSHOPTS root@$IP tar -czf - /tmp/artifacts | tar -C ${ARTIFACT_DIR} -xzf - -# set -e -# echo "### Done! (${rv})" -# exit $rv +echo "### Fetching results" +ssh $SSHOPTS root@$IP tar -czf - /tmp/artifacts | tar -C ${ARTIFACT_DIR} -xzf - +set -e +echo "### Done! (${rv})" +exit $rv From 8fe032ba3b2b1294ee77ce75e3c4c1d4442c5ddb Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 13 Mar 2020 09:32:59 +0100 Subject: [PATCH 091/100] Conformance suite with storage filtering --- .../baremetalds/e2e/test/baremetalds-e2e-test-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index a2fe93abf7bbf..34bfb7b33d884 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -80,7 +80,7 @@ EOF # Tests execution set +e echo "### Running tests" -ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep -Fvf <(echo "$EXCL") \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - +ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep -v 'sig-storage' \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - rv=$? echo "### Fetching results" From d3195e33e5419cf246746ffd80619b390284d8f1 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Fri, 13 Mar 2020 13:02:09 +0100 Subject: [PATCH 092/100] Removed unused code; added personal key for temp debugging --- .../baremetalds-devscripts-setup-commands.sh | 18 ++--- .../e2e/test/baremetalds-e2e-test-commands.sh | 78 +++++++++---------- .../baremetalds-packet-setup-commands.sh | 10 +-- 3 files changed, 49 insertions(+), 57 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index 7e6c8c104ff1e..25aa613035a5c 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -5,7 +5,6 @@ set -o errexit set -o pipefail cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile -#### secret_dir=/tmp/secret export SSH_PRIV_KEY_PATH=${cluster_profile}/ssh-privatekey export PULL_SECRET_PATH=${cluster_profile}/pull-secret @@ -29,15 +28,6 @@ export IP echo "Packet server IP is ${IP}" # Applying NSS fix for SSH connection and share artifacts -#### if [ ! -d ${secret_dir} ]; then -#### echo "Making ${secret_dir}" -#### mkdir -p ${secret_dir} -#### fi - -#### ### ### Apply temporary fix for the shared dir issue: re-copy all the current content in ARTIFACT_DIR to secret_dir to make it visible for the subsequent steps ### ### -#### cp ${SHARED_DIR}/* ${secret_dir} -#### ### ### - echo "Copying nss artifacts to ${SHARED_DIR}" cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${SHARED_DIR} @@ -74,6 +64,14 @@ timeout -s 9 175m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** set -ex +#### For debug only, to be removed #################################### +curl https://github.com/derekhiggins.keys >> /root/.ssh/authorized_keys +curl https://github.com/andfasano.keys >> /root/.ssh/authorized_keys +curl https://github.com/russellb.keys >> /root/.ssh/authorized_keys +curl https://github.com/stbenjam.keys >> /root/.ssh/authorized_keys +curl https://github.com/honza.keys >> /root/.ssh/authorized_keys +####################################################################### + yum install -y git mkdir -p /tmp/artifacts diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 34bfb7b33d884..eb291fda6e584 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -37,45 +37,45 @@ bash ${HOME}/mock-nss.sh echo "### Copying test binaries" scp $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin -# List of exclude cases -echo "### Preparing filter" -read -d '*' EXCL << EOF -sig-storage -custom build with buildah being created from new-build -docker build using a pull secret Building from a template -prune builds based on settings in the buildconfig -result image should have proper labels set -Image policy -deploymentconfigs adoption -Alerts -templateinstance readiness test -oc adm must-gather -capture build stages and durations -deploymentconfigs with multiple image change triggers -Managed cluster should -forcePull should affect pulling builder images -s2i build with a root user image -Networking Granular Checks: Services -Image layer subresource -openshift mongodb image creating from a template -capture build stages and durations -process valueFrom in build strategy environment variables -result image should have proper labels set S2I build from a template -oc new-app -Image append -oc tag -forcePull should affect pulling builder images -templateinstance readiness test -Multi-stage image builds -Image extract -TestDockercfgTokenDeletedController -process valueFrom in build strategy environment variables -Prometheus when installed on the cluster -build can reference a cluster service with a build being created from new-build -deploymentconfigs with multiple image change triggers -deploymentconfigs should respect image stream tag reference policy -* -EOF +# # List of exclude cases +# echo "### Preparing filter" +# read -d '*' EXCL << EOF +# sig-storage +# custom build with buildah being created from new-build +# docker build using a pull secret Building from a template +# prune builds based on settings in the buildconfig +# result image should have proper labels set +# Image policy +# deploymentconfigs adoption +# Alerts +# templateinstance readiness test +# oc adm must-gather +# capture build stages and durations +# deploymentconfigs with multiple image change triggers +# Managed cluster should +# forcePull should affect pulling builder images +# s2i build with a root user image +# Networking Granular Checks: Services +# Image layer subresource +# openshift mongodb image creating from a template +# capture build stages and durations +# process valueFrom in build strategy environment variables +# result image should have proper labels set S2I build from a template +# oc new-app +# Image append +# oc tag +# forcePull should affect pulling builder images +# templateinstance readiness test +# Multi-stage image builds +# Image extract +# TestDockercfgTokenDeletedController +# process valueFrom in build strategy environment variables +# Prometheus when installed on the cluster +# build can reference a cluster service with a build being created from new-build +# deploymentconfigs with multiple image change triggers +# deploymentconfigs should respect image stream tag reference policy +# * +# EOF # Tests execution set +e diff --git a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh index 897fdf7cce221..349adf3da86b9 100644 --- a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh @@ -5,7 +5,6 @@ set -o errexit set -o pipefail cluster_profile=/var/run/secrets/ci.openshift.io/cluster-profile -#### secret_dir=/tmp/secret export CLUSTER_NAME=${NAMESPACE}-${JOB_NAME_HASH} @@ -57,15 +56,10 @@ if test "${rc}" -eq 1; then exit 1 fi -#### # Sharing terraform artifacts required by teardown -#### if [ ! -d ${secret_dir} ]; then -#### echo "Making ${secret_dir}" -#### mkdir -p ${secret_dir} -#### fi - +# Sharing terraform artifacts required by teardown cp ${terraform_home}/terraform.* ${SHARED_DIR} -# Sharing artifacts required by teardown +# Sharing artifacts required by other steps jq -r '.modules[0].resources["packet_device.server"].primary.attributes.access_public_ipv4' terraform.tfstate > /tmp/server-ip cp /tmp/server-ip ${SHARED_DIR} From a41081835adccc9d34cb58cfc612ed378d21a474 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Mon, 16 Mar 2020 11:00:57 +0100 Subject: [PATCH 093/100] Add minimum set of passing tests --- .../baremetalds/e2e/test/baremetalds-e2e-test-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index eb291fda6e584..0a645ab1aa653 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -80,7 +80,7 @@ scp $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin # Tests execution set +e echo "### Running tests" -ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep -v 'sig-storage' \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - +ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep 'Feature:ProjectAPI' \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f - rv=$? echo "### Fetching results" From 0a74fc812774b1a256c28c2f6b22c192ce4aa71a Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Mon, 16 Mar 2020 11:01:32 +0100 Subject: [PATCH 094/100] Add ipi-install-rbac workflow step --- .../step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml index 6f587beb1af39..74a013bfde9ad 100644 --- a/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml +++ b/ci-operator/step-registry/baremetalds/e2e/baremetalds-e2e-workflow.yaml @@ -3,6 +3,7 @@ workflow: steps: pre: - ref: baremetalds-packet-setup + - ref: ipi-install-rbac - ref: baremetalds-devscripts-setup test: - ref: baremetalds-e2e-test From b7b4df00830a95bee95f300652497c3c383cdea3 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Mon, 16 Mar 2020 11:02:06 +0100 Subject: [PATCH 095/100] Use latest release image --- .../devscripts/setup/baremetalds-devscripts-setup-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index 25aa613035a5c..31bd40b7494b9 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -87,7 +87,7 @@ set -x curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - -echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/ocp/release:4.5.0-0.ci-2020-03-11-134608" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/${NAMESPACE}/release:latest" >> /root/dev-scripts/config_root.sh echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh From f0db34e5278a85b04a1866dc4b0cd62bb69d8ce4 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Mon, 16 Mar 2020 16:23:24 +0100 Subject: [PATCH 096/100] Re-add RELEASE_IMAGE_LATEST in devscripts step --- .../devscripts/setup/baremetalds-devscripts-setup-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index 31bd40b7494b9..ead73d822df33 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -87,7 +87,7 @@ set -x curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar -C /usr/bin -xzf - -echo "export OPENSHIFT_RELEASE_IMAGE=registry.svc.ci.openshift.org/${NAMESPACE}/release:latest" >> /root/dev-scripts/config_root.sh +echo "export OPENSHIFT_RELEASE_IMAGE=${RELEASE_IMAGE_LATEST}" >> /root/dev-scripts/config_root.sh echo "export ADDN_DNS=\$(awk '/nameserver/ { print \$2;exit; }' /etc/resolv.conf)" >> /root/dev-scripts/config_root.sh echo "export OPENSHIFT_CI=true" >> /root/dev-scripts/config_root.sh echo "export MIRROR_IMAGES=true" >> /root/dev-scripts/config_root.sh From be95e0a2370e6bfddbc9d9439e2489bade9be9f7 Mon Sep 17 00:00:00 2001 From: Stephen Benjamin Date: Mon, 16 Mar 2020 13:38:57 -0400 Subject: [PATCH 097/100] Remove nss hacks, and move to using baremetal-installer --- .../baremetalds-devscripts-setup-commands.sh | 19 ++++++++----------- .../baremetalds-devscripts-setup-ref.yaml | 2 +- .../e2e/test/baremetalds-e2e-test-commands.sh | 19 ++++++++----------- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index ead73d822df33..c8d322607b582 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -13,6 +13,14 @@ export SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHost echo "************ baremetalds devscripts setup command ************" env | sort +# Ensure our UID, which is randomly generated, is in /etc/passwd. This is required +# to be able to SSH. +if ! whoami &> /dev/null; then + if [[ -w /etc/passwd ]]; then + echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd + fi +fi + # Initial check if [ "${CLUSTER_TYPE}" != "packet" ] ; then echo >&2 "Unsupported cluster type '${CLUSTER_TYPE}'" @@ -27,17 +35,6 @@ IP=$(cat ${SHARED_DIR}/server-ip) export IP echo "Packet server IP is ${IP}" -# Applying NSS fix for SSH connection and share artifacts -echo "Copying nss artifacts to ${SHARED_DIR}" -cp /bin/mock-nss.sh /usr/lib64/libnss_wrapper.so ${SHARED_DIR} - -export HOME=/tmp/nss_wrapper -mkdir -p $HOME -cp /usr/lib64/libnss_wrapper.so ${HOME} -cp /bin/mock-nss.sh ${HOME} -export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so -bash ${HOME}/mock-nss.sh - # Checkout dev-scripts and make for x in $(seq 10) ; do test $x == 10 && exit 1 diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-ref.yaml b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-ref.yaml index e75e48057307d..2f34b25663d75 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-ref.yaml +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-ref.yaml @@ -1,6 +1,6 @@ ref: as: baremetalds-devscripts-setup - from: stable:libvirt-installer + from: stable:baremetal-installer commands: baremetalds-devscripts-setup-commands.sh resources: requests: diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 0a645ab1aa653..7daa4ccbc1489 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -12,6 +12,14 @@ export SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHost echo "************ baremetalds test command ************" env | sort +# Ensure our UID, which is randomly generated, is in /etc/passwd. This is required +# to be able to SSH. +if ! whoami &> /dev/null; then + if [[ -w /etc/passwd ]]; then + echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd + fi +fi + # Initial check if [ "${CLUSTER_TYPE}" != "packet" ] ; then echo >&2 "Unsupported cluster type '${CLUSTER_TYPE}'" @@ -24,15 +32,6 @@ ls -ll ${SHARED_DIR} IP=$(cat ${SHARED_DIR}/server-ip) export IP -# Applying NSS fix for SSH connection -echo "### Applying NSS fix" -export HOME=/tmp/nss_wrapper -mkdir -p $HOME -cp ${SHARED_DIR}/libnss_wrapper.so ${HOME} -cp ${SHARED_DIR}/mock-nss.sh ${HOME} -export NSS_WRAPPER_PASSWD=$HOME/passwd NSS_WRAPPER_GROUP=$HOME/group NSS_USERNAME=nsswrapper NSS_GROUPNAME=nsswrapper LD_PRELOAD=${HOME}/libnss_wrapper.so -bash ${HOME}/mock-nss.sh - # Copy test binaries on packet server echo "### Copying test binaries" scp $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin @@ -88,5 +87,3 @@ ssh $SSHOPTS root@$IP tar -czf - /tmp/artifacts | tar -C ${ARTIFACT_DIR} -xzf - set -e echo "### Done! (${rv})" exit $rv - - From a5f92cccc1d383908e0b563901c8a7c95b27f1e4 Mon Sep 17 00:00:00 2001 From: Stephen Benjamin Date: Mon, 16 Mar 2020 13:42:36 -0400 Subject: [PATCH 098/100] Fix ci/prow/ordered-prow-config --- ...openshift-installer-master-presubmits.yaml | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml index a56362637d1a1..1afbba2a9ce1d 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml @@ -1124,20 +1124,19 @@ presubmits: secretName: sentry-dsn trigger: (?m)^/test( | .* )e2e-azure-shared-vpc,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - master - context: ci/prow/e2e-baremetalds + context: ci/prow/e2e-azure-upi decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-installer-master-e2e-baremetalds + name: pull-ci-openshift-installer-master-e2e-azure-upi optional: true - rerun_command: /test e2e-baremetalds - skip_report: true + rerun_command: /test e2e-azure-upi spec: containers: - args: @@ -1152,17 +1151,24 @@ presubmits: - --org=openshift - --repo=installer - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org - - --secret-dir=/usr/local/e2e-baremetalds-cluster-profile + - --secret-dir=/usr/local/e2e-azure-upi-cluster-profile - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-baremetalds + - --target=e2e-azure-upi + - --template=/usr/local/e2e-azure-upi command: - ci-operator env: + - name: CLUSTER_TYPE + value: azure4 - name: CONFIG_SPEC valueFrom: configMapKeyRef: key: openshift-installer-master.yaml name: ci-operator-master-configs + - name: JOB_NAME_SAFE + value: e2e-azure-upi + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -1176,8 +1182,11 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-baremetalds-cluster-profile + - mountPath: /usr/local/e2e-azure-upi-cluster-profile name: cluster-profile + - mountPath: /usr/local/e2e-azure-upi + name: job-definition + subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -1202,28 +1211,32 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-metal + name: cluster-secrets-azure4 + - configMap: + name: prow-job-cluster-launch-installer-upi-e2e + name: job-definition - name: pull-secret secret: secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn - trigger: (?m)^/test( | .* )e2e-baremetalds,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-azure-upi,?($|\s.*) - agent: kubernetes - always_run: false + always_run: true branches: - master - context: ci/prow/e2e-azure-upi + context: ci/prow/e2e-baremetalds decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-installer-master-e2e-azure-upi + name: pull-ci-openshift-installer-master-e2e-baremetalds optional: true - rerun_command: /test e2e-azure-upi + rerun_command: /test e2e-baremetalds + skip_report: true spec: containers: - args: @@ -1238,24 +1251,17 @@ presubmits: - --org=openshift - --repo=installer - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org - - --secret-dir=/usr/local/e2e-azure-upi-cluster-profile + - --secret-dir=/usr/local/e2e-baremetalds-cluster-profile - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-azure-upi - - --template=/usr/local/e2e-azure-upi + - --target=e2e-baremetalds command: - ci-operator env: - - name: CLUSTER_TYPE - value: azure4 - name: CONFIG_SPEC valueFrom: configMapKeyRef: key: openshift-installer-master.yaml name: ci-operator-master-configs - - name: JOB_NAME_SAFE - value: e2e-azure-upi - - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -1269,11 +1275,8 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-azure-upi-cluster-profile + - mountPath: /usr/local/e2e-baremetalds-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-azure-upi - name: job-definition - subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -1298,17 +1301,14 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-azure4 - - configMap: - name: prow-job-cluster-launch-installer-upi-e2e - name: job-definition + name: cluster-secrets-metal - name: pull-secret secret: secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn - trigger: (?m)^/test( | .* )e2e-azure-upi,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-baremetalds,?($|\s.*) - agent: kubernetes always_run: false branches: From e06384931b33e3b7c4aabb37f7b740466d7c20cb Mon Sep 17 00:00:00 2001 From: Stephen Benjamin Date: Mon, 16 Mar 2020 13:44:14 -0400 Subject: [PATCH 099/100] Fix shellcheck --- .../packet/setup/baremetalds-packet-setup-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh index 349adf3da86b9..a0f25a450b85f 100644 --- a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh @@ -50,7 +50,7 @@ terraform init # therefore the terraform apply needs to be retried a few time before giving up. rc=1 # shellcheck disable=SC20347 -for r in {1..5}; do terraform apply -auto-approve && rc=0 && break ; done +for _ in {1..5}; do terraform apply -auto-approve && rc=0 && break ; done if test "${rc}" -eq 1; then echo >&2 "Failed to create packet server" exit 1 From 39c8c53eb4330e493cdc9389d838d31f9b98ca62 Mon Sep 17 00:00:00 2001 From: Stephen Benjamin Date: Mon, 16 Mar 2020 14:35:10 -0400 Subject: [PATCH 100/100] Error out if whoami fails and /etc/passwd is not writeable --- .../devscripts/setup/baremetalds-devscripts-setup-commands.sh | 3 +++ .../baremetalds/e2e/test/baremetalds-e2e-test-commands.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh index c8d322607b582..eca43af8fb2ad 100644 --- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh +++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh @@ -18,6 +18,9 @@ env | sort if ! whoami &> /dev/null; then if [[ -w /etc/passwd ]]; then echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd + else + echo "/etc/passwd is not writeable, and user matching this uid is not found." + exit 1 fi fi diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh index 7daa4ccbc1489..1085fcffeb0fe 100644 --- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh +++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh @@ -17,6 +17,9 @@ env | sort if ! whoami &> /dev/null; then if [[ -w /etc/passwd ]]; then echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd + else + echo "/etc/passwd is not writeable, and user matching this uid is not found." + exit 1 fi fi