[7.17] [meta] set jenkins workers to ubuntu (elastic#1690) (elastic#1697

) * [meta] set jenkins workers to ubuntu (elastic#1690) This commit is updating the helm-charts Jenkins jobs configuration to use Ubuntu nodes only. This change is mostly to fix a bug with the ampersands (`&`) in the node labels. The only real change here is replacing every occurrence of `docker&&virtual` by `ubuntu`. All other changes are simply yaml formatting done by VS Code. * Update .ci/jobs.t/elastic+helm-charts+{branch}+template-lint-python.yml
jmlrt · Sep 14, 2022 · b1ba495 · b1ba495
1 parent 41a48f6
commit b1ba495
Show file tree

Hide file tree

Showing 10 changed files with 214 additions and 214 deletions.
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+cluster-cleanup.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+cluster-cleanup.yml
@@ -4,33 +4,33 @@
     display-name: elastic / helm-charts - %BRANCH% - cluster cleanup
     description: cluster cleanup
     scm:
-    - git:
-        wipe-workspace: 'True'
+      - git:
+          wipe-workspace: "True"
     axes:
-    - axis:
-        type: slave
-        name: label
-        values:
-        - docker&&virtual
-    - axis:
-        type: yaml
-        name: KUBERNETES_VERSION
-        filename: helpers/matrix.yml
+      - axis:
+          type: slave
+          name: label
+          values:
+            - ubuntu
+      - axis:
+          type: yaml
+          name: KUBERNETES_VERSION
+          filename: helpers/matrix.yml
     builders:
-    - shell: |-
-        #!/usr/local/bin/runbld
-        set -euo pipefail
+      - shell: |-
+          #!/usr/local/bin/runbld
+          set -euo pipefail
 
-        source /usr/local/bin/bash_standard_lib.sh
+          source /usr/local/bin/bash_standard_lib.sh
 
-        set +x
-        VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
-        export VAULT_TOKEN
-        unset VAULT_ROLE_ID VAULT_SECRET_ID
-        set -x
+          set +x
+          VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
+          export VAULT_TOKEN
+          unset VAULT_ROLE_ID VAULT_SECRET_ID
+          set -x
 
         BRANCH_NAME="%BRANCH%"
         cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
 
-        cd helpers/terraform/
-        ./in-docker make destroy KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name}
+          cd helpers/terraform/
+          ./in-docker make destroy KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name}
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+cluster-creation.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+cluster-creation.yml
@@ -4,33 +4,33 @@
     display-name: elastic / helm-charts - %BRANCH% - cluster creation
     description: cluster creation
     scm:
-    - git:
-        wipe-workspace: 'True'
+      - git:
+          wipe-workspace: "True"
     axes:
-    - axis:
-        type: slave
-        name: label
-        values:
-        - docker&&virtual
-    - axis:
-        type: yaml
-        name: KUBERNETES_VERSION
-        filename: helpers/matrix.yml
+      - axis:
+          type: slave
+          name: label
+          values:
+            - ubuntu
+      - axis:
+          type: yaml
+          name: KUBERNETES_VERSION
+          filename: helpers/matrix.yml
     builders:
-    - shell: |-
-        #!/usr/local/bin/runbld
-        set -euo pipefail
+      - shell: |-
+          #!/usr/local/bin/runbld
+          set -euo pipefail
 
-        source /usr/local/bin/bash_standard_lib.sh
+          source /usr/local/bin/bash_standard_lib.sh
 
-        set +x
-        VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
-        export VAULT_TOKEN
-        unset VAULT_ROLE_ID VAULT_SECRET_ID
-        set -x
+          set +x
+          VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
+          export VAULT_TOKEN
+          unset VAULT_ROLE_ID VAULT_SECRET_ID
+          set -x
 
         BRANCH_NAME="%BRANCH%"
         cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
 
-        cd helpers/terraform/
-        ./in-docker make up KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name}
+          cd helpers/terraform/
+          ./in-docker make up KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name}
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+integration-apm-server.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+integration-apm-server.yml
@@ -4,37 +4,37 @@
     display-name: elastic / helm-charts - %BRANCH% - integration apm-server
     description: integration apm-server
     scm:
-    - git:
-        wipe-workspace: 'True'
+      - git:
+          wipe-workspace: "True"
     axes:
-    - axis:
-        type: slave
-        name: label
-        values:
-        - docker&&virtual
-    - axis:
-        type: yaml
-        name: APM_SERVER_SUITE
-        filename: helpers/matrix.yml
-    - axis:
-        type: yaml
-        name: KUBERNETES_VERSION
-        filename: helpers/matrix.yml
+      - axis:
+          type: slave
+          name: label
+          values:
+            - ubuntu
+      - axis:
+          type: yaml
+          name: APM_SERVER_SUITE
+          filename: helpers/matrix.yml
+      - axis:
+          type: yaml
+          name: KUBERNETES_VERSION
+          filename: helpers/matrix.yml
     builders:
-    - shell: |-
-        #!/usr/local/bin/runbld
-        set -euo pipefail
+      - shell: |-
+          #!/usr/local/bin/runbld
+          set -euo pipefail
 
-        source /usr/local/bin/bash_standard_lib.sh
+          source /usr/local/bin/bash_standard_lib.sh
 
-        set +x
-        VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
-        export VAULT_TOKEN
-        unset VAULT_ROLE_ID VAULT_SECRET_ID
-        set -x
+          set +x
+          VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
+          export VAULT_TOKEN
+          unset VAULT_ROLE_ID VAULT_SECRET_ID
+          set -x
 
         BRANCH_NAME="%BRANCH%"
         cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
 
-        cd helpers/terraform/
-        ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${APM_SERVER_SUITE} CHART=apm-server
+          cd helpers/terraform/
+          ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${APM_SERVER_SUITE} CHART=apm-server
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+integration-elasticsearch.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+integration-elasticsearch.yml
@@ -4,37 +4,37 @@
     display-name: elastic / helm-charts - %BRANCH% - integration elasticsearch
     description: integration elasticsearch
     scm:
-    - git:
-        wipe-workspace: 'True'
+      - git:
+          wipe-workspace: "True"
     axes:
-    - axis:
-        type: slave
-        name: label
-        values:
-        - docker&&virtual
-    - axis:
-        type: yaml
-        name: ES_SUITE
-        filename: helpers/matrix.yml
-    - axis:
-        type: yaml
-        name: KUBERNETES_VERSION
-        filename: helpers/matrix.yml
+      - axis:
+          type: slave
+          name: label
+          values:
+            - ubuntu
+      - axis:
+          type: yaml
+          name: ES_SUITE
+          filename: helpers/matrix.yml
+      - axis:
+          type: yaml
+          name: KUBERNETES_VERSION
+          filename: helpers/matrix.yml
     builders:
-    - shell: |-
-        #!/usr/local/bin/runbld
-        set -euo pipefail
+      - shell: |-
+          #!/usr/local/bin/runbld
+          set -euo pipefail
 
-        source /usr/local/bin/bash_standard_lib.sh
+          source /usr/local/bin/bash_standard_lib.sh
 
-        set +x
-        VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
-        export VAULT_TOKEN
-        unset VAULT_ROLE_ID VAULT_SECRET_ID
-        set -x
+          set +x
+          VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
+          export VAULT_TOKEN
+          unset VAULT_ROLE_ID VAULT_SECRET_ID
+          set -x
 
         BRANCH_NAME="%BRANCH%"
         cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
 
-        cd helpers/terraform/
-        ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${ES_SUITE} CHART=elasticsearch
+          cd helpers/terraform/
+          ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${ES_SUITE} CHART=elasticsearch
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+integration-filebeat.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+integration-filebeat.yml
@@ -4,37 +4,37 @@
     display-name: elastic / helm-charts - %BRANCH% - integration filebeat
     description: integration filebeat
     scm:
-    - git:
-        wipe-workspace: 'True'
+      - git:
+          wipe-workspace: "True"
     axes:
-    - axis:
-        type: slave
-        name: label
-        values:
-        - docker&&virtual
-    - axis:
-        type: yaml
-        name: FILEBEAT_SUITE
-        filename: helpers/matrix.yml
-    - axis:
-        type: yaml
-        name: KUBERNETES_VERSION
-        filename: helpers/matrix.yml
+      - axis:
+          type: slave
+          name: label
+          values:
+            - ubuntu
+      - axis:
+          type: yaml
+          name: FILEBEAT_SUITE
+          filename: helpers/matrix.yml
+      - axis:
+          type: yaml
+          name: KUBERNETES_VERSION
+          filename: helpers/matrix.yml
     builders:
-    - shell: |-
-        #!/usr/local/bin/runbld
-        set -euo pipefail
+      - shell: |-
+          #!/usr/local/bin/runbld
+          set -euo pipefail
 
-        source /usr/local/bin/bash_standard_lib.sh
+          source /usr/local/bin/bash_standard_lib.sh
 
-        set +x
-        VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
-        export VAULT_TOKEN
-        unset VAULT_ROLE_ID VAULT_SECRET_ID
-        set -x
+          set +x
+          VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
+          export VAULT_TOKEN
+          unset VAULT_ROLE_ID VAULT_SECRET_ID
+          set -x
 
         BRANCH_NAME="%BRANCH%"
         cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
 
-        cd helpers/terraform/
-        ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${FILEBEAT_SUITE} CHART=filebeat
+          cd helpers/terraform/
+          ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${FILEBEAT_SUITE} CHART=filebeat
diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+integration-kibana.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+integration-kibana.yml
@@ -4,37 +4,37 @@
     display-name: elastic / helm-charts - %BRANCH% - integration kibana
     description: integration kibana
     scm:
-    - git:
-        wipe-workspace: 'True'
+      - git:
+          wipe-workspace: "True"
     axes:
-    - axis:
-        type: slave
-        name: label
-        values:
-        - docker&&virtual
-    - axis:
-        type: yaml
-        name: KIBANA_SUITE
-        filename: helpers/matrix.yml
-    - axis:
-        type: yaml
-        name: KUBERNETES_VERSION
-        filename: helpers/matrix.yml
+      - axis:
+          type: slave
+          name: label
+          values:
+            - ubuntu
+      - axis:
+          type: yaml
+          name: KIBANA_SUITE
+          filename: helpers/matrix.yml
+      - axis:
+          type: yaml
+          name: KUBERNETES_VERSION
+          filename: helpers/matrix.yml
     builders:
-    - shell: |-
-        #!/usr/local/bin/runbld
-        set -euo pipefail
+      - shell: |-
+          #!/usr/local/bin/runbld
+          set -euo pipefail
 
-        source /usr/local/bin/bash_standard_lib.sh
+          source /usr/local/bin/bash_standard_lib.sh
 
-        set +x
-        VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
-        export VAULT_TOKEN
-        unset VAULT_ROLE_ID VAULT_SECRET_ID
-        set -x
+          set +x
+          VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID")
+          export VAULT_TOKEN
+          unset VAULT_ROLE_ID VAULT_SECRET_ID
+          set -x
 
         BRANCH_NAME="%BRANCH%"
         cluster_name="helm-${KUBERNETES_VERSION//./}-${BRANCH_NAME//./}"
 
-        cd helpers/terraform/
-        ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${KIBANA_SUITE} CHART=kibana
+          cd helpers/terraform/
+          ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${KIBANA_SUITE} CHART=kibana