Remove unused jobs and related files

This change removes a bunch of unused and unmaintained files
and job declarations related to deploying osh-infra with armada.

Change-Id: I158a255132cd6b02607b6e1e77b8b9525cc8a3d5

playbooks/gather-armada-manifests.yaml

@@ -1,44 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-- hosts: primary
-  tasks:
-    - name: "creating directory for rendered armada manifests"
-      file:
-        path: "/tmp/logs/armada"
-        state: directory
-
-    - name: "retrieve all armada manifests"
-      shell: |-
-              cat /tmp/{{ manifest }}.yaml > /tmp/logs/armada/{{ manifest }}.yaml
-      loop_control:
-        loop_var: manifest
-      with_items:
-        - armada-cluster-ingress
-        - armada-ceph
-        - armada-lma
-        - updated-armada-cluster-ingress
-        - updated-armada-ceph
-        - updated-armada-lma
-        - updated-password-armada-lma
-      args:
-        executable: /bin/bash
-      ignore_errors: True
-
-    - name: "Downloads armada manifests to executor"
-      synchronize:
-        src: "/tmp/logs/armada"
-        dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}"
-        mode: pull
-      ignore_errors: True
-...

tools/deployment/armada/010-armada-host-setup.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-set -xe
-
-sudo apt-get install -y python3-pip
-sudo pip3 install --upgrade pip requests

tools/deployment/armada/015-armada-build.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-set -xe
-
-TMP_DIR=$(mktemp -d)
-
-git clone --depth 1 http://github.com/openstack/airship-armada.git ${TMP_DIR}/armada
-sudo pip3 install ${TMP_DIR}/armada
-sudo make build -C ${TMP_DIR}/armada
-sudo rm -rf ${TMP_DIR}

tools/deployment/armada/020-armada-render-manifests.sh

@@ -1,46 +0,0 @@
-#!/bin/bash
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-set -xe
-
-source ./tools/deployment/armada/generate-osh-infra-passwords.sh
-: ${OSH_INFRA_PATH:="./"}
-
-[ -s /tmp/ceph-fs-uuid.txt ] || uuidgen > /tmp/ceph-fs-uuid.txt
-#NOTE(portdirect): to use RBD devices with Ubuntu kernels < 4.5 this
-# should be set to 'hammer'
-. /etc/os-release
-if [ "x${ID}" == "xubuntu" ] && \
-   [ "$(uname -r | awk -F "." '{ print $2 }')" -lt "5" ]; then
-  export CRUSH_TUNABLES=hammer
-else
-  export CRUSH_TUNABLES=null
-fi
-
-export CEPH_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
-export CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)"
-export RELEASE_UUID=$(uuidgen)
-export TUNNEL_DEVICE=$(ip -4 route list 0/0 | awk '{ print $5; exit }')
-export OSH_INFRA_PATH
-export OSH_PATH
-
-# NOTE(srwilkers): We add this here due to envsubst expanding the ${tag} placeholder in
-# fluentd's configuration. This ensures the placeholder value gets rendered appropriately
-export tag='${tag}'
-
-manifests="armada-cluster-ingress armada-ceph armada-lma"
-for manifest in $manifests; do
-  echo "Rendering $manifest manifest"
-  envsubst < ./tools/deployment/armada/manifests/$manifest.yaml > /tmp/$manifest.yaml
-done

tools/deployment/armada/025-armada-validate-manifests.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-set -xe
-
-manifests="armada-cluster-ingress armada-ceph armada-lma"
-for manifest in $manifests; do
-  echo "Validating $manifest manifest"
-  armada validate /tmp/$manifest.yaml
-done

tools/deployment/armada/030-armada-apply-manifests.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-set -xe
-
-manifests="armada-cluster-ingress armada-ceph armada-lma"
-for manifest in $manifests; do
-  echo "Applying $manifest manifest"
-  armada apply /tmp/$manifest.yaml
-done

tools/deployment/armada/035-armada-update-uuids.sh

@@ -1,44 +0,0 @@
-#!/bin/bash
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-set -xe
-
-# NOTE(srwilkers): sexport all passwords and environment variables used in the original
-# manifests
-while read -r line; do $line; done < /tmp/osh-infra-passwords.env
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-: ${OSH_PATH:="./"}
-
-export CEPH_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
-export CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)"
-export RELEASE_UUID=$(uuidgen)
-export TUNNEL_DEVICE=$(ip -4 route list 0/0 | awk '{ print $5; exit }')
-export OSH_INFRA_PATH
-export OSH_PATH
-
-# NOTE(srwilkers): We add this here due to envsubst expanding the ${tag} placeholder in
-# fluentd's configuration. This ensures the placeholder value gets rendered appropriately
-export tag='${tag}'
-
-manifests="armada-cluster-ingress armada-ceph armada-lma"
-for manifest in $manifests; do
-  echo "Rendering updated-$manifest manifest"
-  envsubst < ./tools/deployment/armada/manifests/$manifest.yaml > /tmp/updated-$manifest.yaml
-
-  echo "Validating updated-$manifest manifest"
-  armada validate /tmp/updated-$manifest.yaml
-
-  echo "Applying updated-$manifest manifest"
-  armada apply /tmp/updated-$manifest.yaml
-done

tools/deployment/armada/040-armada-update-passwords.sh

@@ -1,49 +0,0 @@
-#!/bin/bash
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-set -xe
-
-# Empty previous password file contents
-> /tmp/osh-infra-passwords.env
-
-source ./tools/deployment/armada/generate-osh-infra-passwords.sh
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-
-#NOTE(portdirect): to use RBD devices with Ubuntu kernels < 4.5 this
-# should be set to 'hammer'
-. /etc/os-release
-if [ "x${ID}" == "xubuntu" ] && \
-   [ "$(uname -r | awk -F "." '{ print $2 }')" -lt "5" ]; then
-  export CRUSH_TUNABLES=hammer
-else
-  export CRUSH_TUNABLES=null
-fi
-
-export CEPH_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
-export CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)"
-export RELEASE_UUID=$(uuidgen)
-export OSH_INFRA_PATH
-
-# NOTE(srwilkers): We add this here due to envsubst expanding the ${tag} placeholder in
-# fluentd's configuration. This ensures the placeholder value gets rendered appropriately
-export tag='${tag}'
-
-echo "Rendering updated-password-armada-lma manifest"
-envsubst < ./tools/deployment/armada/manifests/armada-lma.yaml > /tmp/updated-password-armada-lma.yaml
-
-echo "Validating update-password-armada-lma manifest"
-armada validate /tmp/updated-password-armada-lma.yaml
-
-echo "Applying update-password-armada-lma manifest"
-armada apply /tmp/updated-password-armada-lma.yaml

tools/deployment/armada/generate-osh-infra-passwords.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-set -xe
-
-passwords="ELASTICSEARCH_ADMIN_PASSWORD \
-    GRAFANA_ADMIN_PASSWORD \
-    GRAFANA_DB_PASSWORD \
-    GRAFANA_SESSION_DB_PASSWORD \
-    MARIADB_ADMIN_PASSWORD \
-    MARIADB_EXPORTER_PASSWORD \
-    MARIADB_SST_PASSWORD \
-    NAGIOS_ADMIN_PASSWORD \
-    PROMETHEUS_ADMIN_PASSWORD \
-    RADOSGW_S3_ADMIN_ACCESS_KEY \
-    RADOSGW_S3_ADMIN_SECRET_KEY \
-    RADOSGW_S3_ELASTICSEARCH_ACCESS_KEY \
-    RADOSGW_S3_ELASTICSEARCH_SECRET_KEY"
-
-for password in $passwords
-do
-  value=$(tr -dc A-Za-z0-9 < /dev/urandom 2>/dev/null | head -c 20)
-  export $password=$value
-  echo "export $password=$value" >> /tmp/osh-infra-passwords.env
-done

tools/deployment/armada/manifests/armada-ceph.yaml

@@ -1,358 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: helm-toolkit
-data:
-  chart_name: helm-toolkit
-  release: helm-toolkit
-  namespace: helm-toolkit
-  values: {}
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: helm-toolkit
-    reference: master
-  dependencies: []
-...
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ceph-ingress-controller
-data:
-  chart_name: ceph-ingress-controller
-  release: ceph-ingress-controller
-  namespace: ceph
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-ceph-ingress-controller
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-ceph-ingress-controller
-  values:
-    release_uuid: ${RELEASE_UUID}
-    labels:
-      server:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      error_server:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-    pod:
-      replicas:
-        error_page: 2
-        ingress: 2
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: ingress
-    reference: master
-  dependencies:
-    - helm-toolkit
-...
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ceph-mon
-data:
-  chart_name: ceph-mon
-  release: ceph-mon
-  namespace: ceph
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-ceph-mon
-    resources:
-      - type: daemonset
-      - type: deployment
-      - type: job
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-ceph-mon
-  values:
-    release_uuid: ${RELEASE_UUID}
-    endpoints:
-      ceph_mon:
-        namespace: ceph
-    network:
-      public: ${CEPH_NETWORK}
-      cluster: ${CEPH_NETWORK}
-    deployment:
-      storage_secrets: true
-      ceph: true
-    bootstrap:
-      enabled: true
-    conf:
-      ceph:
-        global:
-          fsid: ${CEPH_FS_ID}
-      pool:
-        crush:
-          tunables: ${CRUSH_TUNABLES}
-        target:
-          # NOTE(portdirect): 5 nodes, with one osd per node
-          osd: 5
-          pg_per_osd: 100
-      storage:
-        osd:
-          - data:
-              type: directory
-              location: /var/lib/openstack-helm/ceph/osd/osd-one
-            journal:
-              type: directory
-              location: /var/lib/openstack-helm/ceph/osd/journal-one
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: ceph-mon
-    reference: master
-  dependencies:
-    - helm-toolkit
-...
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ceph-osd
-data:
-  chart_name: ceph-osd
-  release: ceph-osd
-  namespace: ceph
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-ceph-osd
-    resources:
-      - type: daemonset
-    native:
-      enabled: false
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-ceph-osd
-        - type: pod
-          labels:
-            release_group: osh-ceph-osd
-            component: test
-  values:
-    release_uuid: ${RELEASE_UUID}
-    endpoints:
-      ceph_mon:
-        namespace: ceph
-    network:
-      public: ${CEPH_NETWORK}
-      cluster: ${CEPH_NETWORK}
-    deployment:
-      ceph: true
-    bootstrap:
-      enabled: true
-    conf:
-      ceph:
-        global:
-          fsid: ${CEPH_FS_ID}
-      rgw_ks:
-        enabled: true
-      pool:
-        crush:
-          tunables: ${CRUSH_TUNABLES}
-        target:
-          # NOTE(portdirect): 5 nodes, with one osd per node
-          osd: 5
-          pg_per_osd: 100
-      storage:
-        osd:
-          - data:
-              type: directory
-              location: /var/lib/openstack-helm/ceph/osd/osd-one
-            journal:
-              type: directory
-              location: /var/lib/openstack-helm/ceph/osd/journal-one
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: ceph-osd
-    reference: master
-  dependencies:
-    - helm-toolkit
-...
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ceph-client
-data:
-  chart_name: ceph-client
-  release: ceph-client
-  namespace: ceph
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-ceph-client
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-ceph-client
-        - type: pod
-          labels:
-            release_group: osh-ceph-client
-            component: test
-  values:
-    release_uuid: ${RELEASE_UUID}
-    endpoints:
-      ceph_mon:
-        namespace: ceph
-    network:
-      public: ${CEPH_NETWORK}
-      cluster: ${CEPH_NETWORK}
-    deployment:
-      ceph: true
-    bootstrap:
-      enabled: true
-    conf:
-      ceph:
-        global:
-          fsid: ${CEPH_FS_ID}
-      pool:
-        crush:
-          tunables: ${CRUSH_TUNABLES}
-        target:
-          # NOTE(portdirect): 5 nodes, with one osd per node
-          osd: 5
-          pg_per_osd: 100
-      storage:
-        osd:
-          - data:
-              type: directory
-              location: /var/lib/openstack-helm/ceph/osd/osd-one
-            journal:
-              type: directory
-              location: /var/lib/openstack-helm/ceph/osd/journal-one
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: ceph-client
-    reference: master
-  dependencies:
-    - helm-toolkit
-...
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ceph-provisioners
-data:
-  chart_name: ceph-provisioners
-  release: ceph-provisioners
-  namespace: ceph
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-ceph-provisioners
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-ceph-provisioners
-  values:
-    release_uuid: ${RELEASE_UUID}
-    endpoints:
-      ceph_mon:
-        namespace: ceph
-    network:
-      public: ${CEPH_NETWORK}
-      cluster: ${CEPH_NETWORK}
-    deployment:
-      ceph: true
-      rbd_provisioner: true
-      csi_rbd_provisioner: true
-      cephfs_provisioner: false
-      client_secrets: false
-    storageclass:
-      cephfs:
-        provision_storage_class: false
-    manifests:
-      deployment_cephfs_provisioner: false
-      job_cephfs_client_key: false
-    bootstrap:
-      enabled: true
-    conf:
-      ceph:
-        global:
-          fsid: ${CEPH_FS_ID}
-      pool:
-        crush:
-          tunables: ${CRUSH_TUNABLES}
-        target:
-          # NOTE(portdirect): 5 nodes, with one osd per node
-          osd: 5
-          pg_per_osd: 100
-      storage:
-        osd:
-          - data:
-              type: directory
-              location: /var/lib/openstack-helm/ceph/osd/osd-one
-            journal:
-              type: directory
-              location: /var/lib/openstack-helm/ceph/osd/journal-one
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: ceph-provisioners
-    reference: master
-  dependencies:
-    - helm-toolkit
-...
----
-schema: armada/ChartGroup/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ceph-storage
-data:
-  description: "Ceph Storage"
-  sequenced: True
-  chart_group:
-    - ceph-ingress-controller
-    - ceph-mon
-    - ceph-osd
-    - ceph-client
-    - ceph-provisioners
-...
----
-schema: armada/Manifest/v1
-metadata:
-  schema: metadata/Document/v1
-  name: armada-manifest
-data:
-  release_prefix: osh
-  chart_groups:
-    - ceph-storage
-...

tools/deployment/armada/manifests/armada-cluster-ingress.yaml

@@ -1,85 +0,0 @@
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: helm-toolkit
-data:
-  chart_name: helm-toolkit
-  release: helm-toolkit
-  namespace: helm-toolkit
-  values: {}
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: helm-toolkit
-    reference: master
-  dependencies: []
-...
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: ingress-kube-system
-data:
-  chart_name: ingress-kube-system
-  release: ingress-kube-system
-  namespace: kube-system
-  wait:
-    timeout: 1800
-    labels:
-      release_group: osh-ingress-kube-system
-  install:
-    no_hooks: False
-  upgrade:
-    no_hooks: False
-    pre:
-      delete:
-        - type: job
-          labels:
-            release_group: osh-ingress-kube-system
-  values:
-    release_uuid: ${RELEASE_UUID}
-    labels:
-      server:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-      error_server:
-        node_selector_key: openstack-control-plane
-        node_selector_value: enabled
-    pod:
-      replicas:
-        error_page: 2
-    deployment:
-      mode: cluster
-      type: DaemonSet
-    network:
-      host_namespace: true
-  source:
-    type: local
-    location: ${OSH_INFRA_PATH}
-    subpath: ingress
-    reference: master
-  dependencies:
-    - helm-toolkit
-...
----
-schema: armada/ChartGroup/v1
-metadata:
-  schema: metadata/Document/v1
-  name: cluster-ingress-controller
-data:
-  description: "Cluster Ingress Controller"
-  sequenced: False
-  chart_group:
-    - ingress-kube-system
-...
----
-schema: armada/Manifest/v1
-metadata:
-  schema: metadata/Document/v1
-  name: armada-manifest
-data:
-  release_prefix: osh
-  chart_groups:
-    - cluster-ingress-controller
-...

zuul.d/jobs.yaml

@@ -475,74 +475,6 @@
         - ./tools/deployment/elastic-beats/090-elastic-filebeat.sh
         - ./tools/deployment/elastic-beats/100-elastic-packetbeat.sh
 
-- job:
-    name: openstack-helm-infra-armada-deploy
-    parent: openstack-helm-infra-functional
-    nodeset: openstack-helm-five-node-ubuntu
-    timeout: 7200
-    pre-run:
-      - playbooks/osh-infra-upgrade-host.yaml
-      - playbooks/osh-infra-deploy-docker.yaml
-      - playbooks/osh-infra-build.yaml
-      - playbooks/osh-infra-deploy-k8s.yaml
-    post-run:
-      - playbooks/osh-infra-collect-logs.yaml
-      - playbooks/gather-armada-manifests.yaml
-    vars:
-      gate_scripts_relative_path: ../openstack-helm-infra
-      gate_scripts:
-        - ./tools/deployment/armada/010-armada-host-setup.sh
-        - ./tools/deployment/armada/015-armada-build.sh
-        - ./tools/deployment/armada/020-armada-render-manifests.sh
-        - ./tools/deployment/armada/025-armada-validate-manifests.sh
-        - ./tools/deployment/armada/030-armada-apply-manifests.sh
-
-- job:
-    name: openstack-helm-infra-armada-update-uuid
-    parent: openstack-helm-infra-functional
-    nodeset: openstack-helm-five-node-ubuntu
-    timeout: 7200
-    pre-run:
-      - playbooks/osh-infra-upgrade-host.yaml
-      - playbooks/osh-infra-deploy-docker.yaml
-      - playbooks/osh-infra-build.yaml
-      - playbooks/osh-infra-deploy-k8s.yaml
-    post-run:
-      - playbooks/osh-infra-collect-logs.yaml
-      - playbooks/gather-armada-manifests.yaml
-    vars:
-      gate_scripts_relative_path: ../openstack-helm-infra
-      gate_scripts:
-        - ./tools/deployment/armada/010-armada-host-setup.sh
-        - ./tools/deployment/armada/015-armada-build.sh
-        - ./tools/deployment/armada/020-armada-render-manifests.sh
-        - ./tools/deployment/armada/025-armada-validate-manifests.sh
-        - ./tools/deployment/armada/030-armada-apply-manifests.sh
-        - ./tools/deployment/armada/035-armada-update-uuids.sh
-
-- job:
-    name: openstack-helm-infra-armada-update-passwords
-    parent: openstack-helm-infra-functional
-    nodeset: openstack-helm-five-node-ubuntu
-    timeout: 7200
-    pre-run:
-      - playbooks/osh-infra-upgrade-host.yaml
-      - playbooks/osh-infra-deploy-docker.yaml
-      - playbooks/osh-infra-build.yaml
-      - playbooks/osh-infra-deploy-k8s.yaml
-    post-run:
-      - playbooks/osh-infra-collect-logs.yaml
-      - playbooks/gather-armada-manifests.yaml
-    vars:
-      gate_scripts_relative_path: ../openstack-helm-infra
-      gate_scripts:
-        - ./tools/deployment/armada/010-armada-host-setup.sh
-        - ./tools/deployment/armada/015-armada-build.sh
-        - ./tools/deployment/armada/020-armada-render-manifests.sh
-        - ./tools/deployment/armada/025-armada-validate-manifests.sh
-        - ./tools/deployment/armada/030-armada-apply-manifests.sh
-        - ./tools/deployment/armada/040-armada-update-passwords.sh
-
 - job:
     name: openstack-helm-infra-aio-podsecuritypolicy
     parent: openstack-helm-infra-functional

zuul.d/project.yaml

@@ -52,9 +52,6 @@
         - openstack-helm-infra-validate-minikube-aio
         # - openstack-helm-infra-tenant-ceph
         # - openstack-helm-infra-five-ubuntu
-        # - openstack-helm-infra-armada-deploy
-        # - openstack-helm-infra-armada-update-uuid
-        # - openstack-helm-infra-armada-update-passwords
     experimental:
       jobs:
         # NOTE(srwilkers): Disable fedora experimental jobs until issues resolved
@@ -64,9 +61,6 @@
         # - openstack-helm-infra-five-ubuntu
         - openstack-helm-infra-elastic-beats
         # - openstack-helm-infra-tenant-ceph
-        # - openstack-helm-infra-armada-deploy
-        # - openstack-helm-infra-armada-update-uuid
-        # - openstack-helm-infra-armada-update-passwords
         - openstack-helm-infra-federated-monitoring
         - openstack-helm-infra-local-storage
         - openstack-helm-infra-aio-network-policy