From f718c2e38b184fdbeb158cd8ce5b3e7344600bea Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Thu, 6 Jun 2024 06:01:02 +0200 Subject: [PATCH] fix shellcheck --- hack/e2e.sh | 4 +- .../boskos-resources-user-data.yaml | 60 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/hack/e2e.sh b/hack/e2e.sh index dc249f0757..f21c8406cc 100755 --- a/hack/e2e.sh +++ b/hack/e2e.sh @@ -39,7 +39,7 @@ source "${REPO_ROOT}/hack/ensure-kubectl.sh" make boskosctl export BOSKOS_RESOURCE_OWNER=cluster-api-provider-vsphere if [[ "${JOB_NAME}" != "" ]]; then - export BOSKOS_RESOURCE_OWNER="${JOB_NAME}-${JOB_NAME}" + export BOSKOS_RESOURCE_OWNER="${JOB_NAME}/${BUILD_ID}" fi export BOSKOS_RESOURCE_TYPE=vsphere-project-cluster-api-provider @@ -140,7 +140,7 @@ if [[ ! "${GINKGO_FOCUS:-}" =~ $RE_VCSIM ]]; then # Check out the account from Boskos and store the produced environment # variables in a temporary file. account_env_var_file="$(mktemp)" - boskosctl acquire --resource-owner=${BOSKOS_RESOURCE_OWNER} --resource-type=${BOSKOS_RESOURCE_TYPE} 1>"${account_env_var_file}" + boskosctl acquire --resource-owner="${BOSKOS_RESOURCE_OWNER}" --resource-type=${BOSKOS_RESOURCE_TYPE} 1>"${account_env_var_file}" checkout_account_status="${?}" # If the checkout process was a success then load the account's diff --git a/tmp-boskos-poc/boskos-resources-user-data.yaml b/tmp-boskos-poc/boskos-resources-user-data.yaml index 40d85edc59..b497aa9d6d 100644 --- a/tmp-boskos-poc/boskos-resources-user-data.yaml +++ b/tmp-boskos-poc/boskos-resources-user-data.yaml @@ -5,154 +5,154 @@ resources: userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/001 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/001 - ipPool: '{\"addresses\":[\"192.168.24.361-192.168.24.376\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.26.001-192.168.26.016\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-002 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/002 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/002 - ipPool: '{\"addresses\":[\"192.168.24.377-192.168.24.392\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.26.017-192.168.26.032\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-003 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/003 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/003 - ipPool: '{\"addresses\":[\"192.168.24.393-192.168.24.408\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.26.033-192.168.26.048\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-004 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/004 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/004 - ipPool: '{\"addresses\":[\"192.168.24.409-192.168.24.424\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.26.049-192.168.26.064\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-005 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/005 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/005 - ipPool: '{\"addresses\":[\"192.168.24.425-192.168.24.440\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.26.065-192.168.26.080\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-006 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/006 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/006 - ipPool: '{\"addresses\":[\"192.168.24.441-192.168.24.456\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.26.081-192.168.26.096\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-007 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/007 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/007 - ipPool: '{\"addresses\":[\"192.168.24.457-192.168.24.472\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.26.097-192.168.26.112\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-008 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/008 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/008 - ipPool: '{\"addresses\":[\"192.168.24.473-192.168.24.488\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.26.113-192.168.26.128\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-009 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/009 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/009 - ipPool: '{\"addresses\":[\"192.168.24.489-192.168.24.504\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.26.129-192.168.26.144\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-010 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/010 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/010 - ipPool: '{\"addresses\":[\"192.168.24.505-192.168.24.520\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.26.145-192.168.26.160\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-011 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/011 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/011 - ipPool: '{\"addresses\":[\"192.168.24.521-192.168.24.536\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.26.161-192.168.26.176\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-012 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/012 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/012 - ipPool: '{\"addresses\":[\"192.168.24.537-192.168.24.552\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.26.177-192.168.26.192\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-013 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/013 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/013 - ipPool: '{\"addresses\":[\"192.168.24.553-192.168.24.568\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.26.193-192.168.26.208\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-014 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/014 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/014 - ipPool: '{\"addresses\":[\"192.168.24.569-192.168.24.584\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.26.209-192.168.26.224\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-015 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/015 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/015 - ipPool: '{\"addresses\":[\"192.168.24.585-192.168.24.600\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.26.225-192.168.26.240\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-016 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/016 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/016 - ipPool: '{\"addresses\":[\"192.168.24.601-192.168.24.616\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.26.241-192.168.26.256\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-017 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/017 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/017 - ipPool: '{\"addresses\":[\"192.168.24.617-192.168.24.632\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.27.001-192.168.27.016\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-018 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/018 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/018 - ipPool: '{\"addresses\":[\"192.168.24.633-192.168.24.648\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.27.017-192.168.27.032\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-019 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/019 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/019 - ipPool: '{\"addresses\":[\"192.168.24.649-192.168.24.664\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.27.033-192.168.27.048\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-020 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/020 folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/020 - ipPool: '{\"addresses\":[\"192.168.24.665-192.168.24.680\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.27.049-192.168.27.064\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - type: vsphere-project-cloud-provider resources: - name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-001 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/001 folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/001 - ipPool: '{\"addresses\":[\"192.168.24.201-192.168.24.216\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.25.001-192.168.25.016\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-002 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/002 folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/002 - ipPool: '{\"addresses\":[\"192.168.24.217-192.168.24.232\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.25.017-192.168.25.032\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-003 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/003 folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/003 - ipPool: '{\"addresses\":[\"192.168.24.233-192.168.24.248\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.25.033-192.168.25.048\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-004 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/004 folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/004 - ipPool: '{\"addresses\":[\"192.168.24.249-192.168.24.264\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.25.049-192.168.25.064\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-005 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/005 folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/005 - ipPool: '{\"addresses\":[\"192.168.24.265-192.168.24.280\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.25.065-192.168.25.080\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-006 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/006 folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/006 - ipPool: '{\"addresses\":[\"192.168.24.281-192.168.24.296\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.25.081-192.168.25.096\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-007 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/007 folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/007 - ipPool: '{\"addresses\":[\"192.168.24.297-192.168.24.312\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.25.097-192.168.25.112\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-008 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/008 folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/008 - ipPool: '{\"addresses\":[\"192.168.24.313-192.168.24.328\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.25.113-192.168.25.128\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-009 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/009 folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/009 - ipPool: '{\"addresses\":[\"192.168.24.329-192.168.24.344\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.25.129-192.168.25.144\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-010 userData: resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/010 folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/010 - ipPool: '{\"addresses\":[\"192.168.24.345-192.168.24.360\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}' + ipPool: '{\"addresses\":[\"192.168.25.145-192.168.25.160\"],\"gateway\":\"192.168.24.1\",\"prefix\":21}' - type: vsphere-project-image-builder resources: - name: k8s-infra-e2e-boskos-vsphere-image-builder-001