Cleanup unused jobs

This change removes a bunch of old and duplicated jobs,
duplicate netpol and the old armada jobs that have not
been maintained. Also removed the tls job from
experimental since we run it now in gating.

Change-Id: Ic19520d8790c52d66d62b20a23658c57d954697e

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,50 +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
-
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-: ${OSH_PATH:="./"}
-
-source ./tools/deployment/armada/generate-osh-passwords.sh
-
-[ -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}'
-
-for manifest in armada-cluster-ingress armada-ceph; do
-  echo "Rendering $manifest manifest"
-  envsubst < ${OSH_INFRA_PATH}/tools/deployment/armada/manifests/$manifest.yaml > /tmp/$manifest.yaml
-done
-
-echo "Rendering armada-osh manifest"
-envsubst < ./tools/deployment/armada/manifests/armada-osh.yaml > /tmp/armada-osh.yaml

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-osh"
-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-osh"
-for manifest in $manifests; do
-  echo "Applying $manifest manifest"
-  armada apply /tmp/$manifest.yaml
-done

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

@@ -1,53 +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): source all passwords and environment variables used in the original
-# manifests
-while read -r line; do $line; done < /tmp/osh-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"
-for manifest in $manifests; do
-  echo "Rendering updated-$manifest manifest"
-  envsubst < ${OSH_INFRA_PATH}/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
-
-echo "Rendering updated-armada-osh manifest"
-envsubst < ./tools/deployment/armada/manifests/armada-osh.yaml > /tmp/updated-armada-osh.yaml
-
-echo "Validating updated-armada-osh manifest"
-armada validate /tmp/updated-armada-osh.yaml
-
-echo "Applying updated-armada-osh manifest"
-armada apply /tmp/updated-armada-osh.yaml

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

@@ -1,52 +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-passwords.env
-
-source ./tools/deployment/armada/generate-osh-passwords.sh
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
-: ${OSH_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 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}'
-
-echo "Rendering new osh manifest"
-envsubst < ./tools/deployment/armada/manifests/armada-osh.yaml > /tmp/updated-password-armada-osh.yaml
-
-echo "Validating new osh manifest"
-armada validate /tmp/updated-password-armada-osh.yaml
-
-echo "Applying new osh manifest"
-armada apply /tmp/updated-password-armada-osh.yaml

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

@@ -1,61 +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="BARBICAN_DB_PASSWORD \
-    BARBICAN_RABBITMQ_USER_PASSWORD \
-    BARBICAN_USER_PASSWORD \
-    CINDER_DB_PASSWORD \
-    CINDER_RABBITMQ_USER_PASSWORD \
-    CINDER_TEST_USER_PASSWORD \
-    CINDER_USER_PASSWORD \
-    GLANCE_DB_PASSWORD \
-    GLANCE_RABBITMQ_USER_PASSWORD \
-    GLANCE_TEST_USER_PASSWORD \
-    GLANCE_USER_PASSWORD \
-    HEAT_DB_PASSWORD \
-    HEAT_RABBITMQ_USER_PASSWORD \
-    HEAT_STACK_PASSWORD \
-    HEAT_TEST_USER_PASSWORD \
-    HEAT_TRUSTEE_PASSWORD \
-    HEAT_USER_PASSWORD \
-    KEYSTONE_ADMIN_PASSWORD \
-    KEYSTONE_AUTHTOKEN_MEMCACHED_SECRET_KEY \
-    KEYSTONE_DB_PASSWORD \
-    KEYSTONE_RABBITMQ_USER_PASSWORD \
-    KEYSTONE_TEST_USER_PASSWORD \
-    METADATA_PROXY_SHARED_SECRET \
-    NEUTRON_DB_PASSWORD \
-    NEUTRON_RABBITMQ_USER_PASSWORD \
-    NEUTRON_TEST_USER_PASSWORD \
-    NEUTRON_USER_PASSWORD \
-    NOVA_DB_PASSWORD \
-    NOVA_PLACEMENT_USER_PASSWORD \
-    NOVA_RABBITMQ_USER_PASSWORD \
-    NOVA_TEST_USER_PASSWORD \
-    NOVA_USER_PASSWORD \
-    OPENSTACK_EXPORTER_USER_PASSWORD \
-    OSH_MARIADB_ADMIN_PASSWORD \
-    OSH_MARIADB_EXPORTER_PASSWORD \
-    OSH_MARIADB_SST_PASSWORD \
-    RABBITMQ_ADMIN_PASSWORD \
-    SWIFT_USER_PASSWORD"
-
-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-passwords.env
-done

tools/gate/playbooks/gather-armada-manifests.yaml

@@ -1,43 +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-osh
-        - updated-armada-cluster-ingress
-        - updated-armada-ceph
-        - updated-armada-lma
-        - updated-armada-osh
-        - updated-password-armada-osh
-      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

zuul.d/jobs-openstack-helm.yaml

@@ -232,6 +232,44 @@
         - ./tools/deployment/component/keystone/keystone.sh
         - ./tools/deployment/component/horizon/horizon.sh
 
+- job:
+    timeout: 10800
+    name: openstack-helm-multinode-compute-kit-ussuri-ubuntu_bionic
+    parent: openstack-helm-chart-deploy
+    nodeset: openstack-helm-five-node-ubuntu
+    vars:
+      zuul_osh_infra_relative_path: ../openstack-helm-infra/
+      osh_params:
+        openstack_release: ussuri
+        container_distro_name: ubuntu
+        container_distro_version: bionic
+    pre-run:
+      - tools/gate/playbooks/multinode-base.yaml
+      - tools/gate/playbooks/osh-infra-upgrade-host.yaml
+      - tools/gate/playbooks/osh-infra-deploy-docker.yaml
+      - tools/gate/playbooks/osh-infra-build.yaml
+      - tools/gate/playbooks/osh-infra-deploy-k8s.yaml
+    run: tools/gate/playbooks/multinode-deploy-compute-kit.yaml
+
+- job:
+    timeout: 9600
+    name: openstack-helm-multinode-cinder-ussuri-ubuntu_bionic
+    parent: openstack-helm-chart-deploy
+    nodeset: openstack-helm-five-node-ubuntu
+    vars:
+      zuul_osh_infra_relative_path: ../openstack-helm-infra/
+      osh_params:
+        openstack_release: ussuri
+        container_distro_name: ubuntu
+        container_distro_version: bionic
+    pre-run:
+      - tools/gate/playbooks/multinode-base.yaml
+      - tools/gate/playbooks/osh-infra-upgrade-host.yaml
+      - tools/gate/playbooks/osh-infra-deploy-docker.yaml
+      - tools/gate/playbooks/osh-infra-build.yaml
+      - tools/gate/playbooks/osh-infra-deploy-k8s.yaml
+    run: tools/gate/playbooks/multinode-deploy-cinder.yaml
+
 - job:
     name: openstack-helm-tls
     parent: openstack-helm-chart-deploy
@@ -326,72 +364,6 @@
         - ./tools/deployment/component/keystone/keystone.sh
         - ./tools/deployment/component/cinder/cinder.sh
 
-- job:
-    name: openstack-helm-netpol-compute-kit-train
-    parent: openstack-helm-chart-deploy
-    timeout: 7200
-    vars:
-      osh_params:
-        openstack_release: train
-        container_distro_name: ubuntu
-        container_distro_version: bionic
-        feature_gates: netpol
-      gate_scripts_relative_path: ../openstack-helm
-      gate_scripts:
-        - ./tools/deployment/common/install-packages.sh
-        - ./tools/deployment/common/deploy-k8s.sh
-        - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/component/common/ingress.sh
-        - ./tools/deployment/common/lockdown-netpol.sh
-        - ./tools/deployment/component/common/mariadb.sh
-        - ./tools/deployment/component/common/memcached.sh
-        - ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
-        - ./tools/deployment/component/keystone/keystone.sh
-        - ./tools/deployment/component/heat/heat.sh
-        - ./tools/deployment/component/glance/glance.sh
-        - ./tools/deployment/component/compute-kit/openvswitch.sh
-        - ./tools/deployment/component/compute-kit/libvirt.sh
-        - ./tools/deployment/component/compute-kit/compute-kit.sh
-        - ./tools/deployment/developer/common/170-setup-gateway.sh
-        - ./tools/deployment/component/horizon/horizon.sh
-        - ./tools/deployment/common/openstack-exporter.sh
-        - ./tools/deployment/developer/common/900-use-it.sh
-        - ./tools/deployment/common/test-networkpolicy.sh
-
-- job:
-    name: openstack-helm-netpol-compute-kit-ussuri
-    parent: openstack-helm-chart-deploy
-    timeout: 7200
-    vars:
-      osh_params:
-        openstack_release: ussuri
-        container_distro_name: ubuntu
-        container_distro_version: bionic
-        feature_gates: netpol
-      gate_scripts_relative_path: ../openstack-helm
-      gate_scripts:
-        - ./tools/deployment/common/install-packages.sh
-        - ./tools/deployment/common/deploy-k8s.sh
-        - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/component/common/ingress.sh
-        - ./tools/deployment/common/lockdown-netpol.sh
-        - ./tools/deployment/component/common/mariadb.sh
-        - ./tools/deployment/component/common/memcached.sh
-        - ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
-        - ./tools/deployment/component/keystone/keystone.sh
-        - ./tools/deployment/component/heat/heat.sh
-        - ./tools/deployment/component/glance/glance.sh
-        - ./tools/deployment/component/compute-kit/openvswitch.sh
-        - ./tools/deployment/component/compute-kit/libvirt.sh
-        - ./tools/deployment/component/compute-kit/compute-kit.sh
-        - ./tools/deployment/developer/common/170-setup-gateway.sh
-        - ./tools/deployment/component/horizon/horizon.sh
-        - ./tools/deployment/common/openstack-exporter.sh
-        - ./tools/deployment/developer/common/900-use-it.sh
-        - ./tools/deployment/common/test-networkpolicy.sh
-
 - job:
     name: openstack-helm-tungsten-fabric-train
     parent: openstack-helm-compute-kit
@@ -463,13 +435,14 @@
           - ./tools/deployment/component/compute-kit/libvirt.sh
         - ./tools/deployment/component/compute-kit/compute-kit.sh
         - ./tools/deployment/component/compute-kit/tungsten-fabric.sh deploy
+
 - job:
     name: openstack-helm-netpol-compute-kit
     parent: openstack-helm-chart-deploy
     timeout: 7200
     vars:
       osh_params:
-        openstack_release: train
+        openstack_release: ussuri
         container_distro_name: ubuntu
         container_distro_version: bionic
         feature_gates: netpol
@@ -502,7 +475,7 @@
     timeout: 7200
     vars:
       osh_params:
-        openstack_release: train
+        openstack_release: ussuri
         container_distro_name: ubuntu
         container_distro_version: bionic
         feature_gates: netpol
@@ -523,171 +496,3 @@
         - ./tools/deployment/component/horizon/horizon.sh
         - ./tools/deployment/common/openstack-exporter.sh
         - ./tools/deployment/common/test-networkpolicy.sh
-
-- job:
-    name: openstack-helm-multinode-temp
-    parent: openstack-helm-infra-functional
-    roles:
-      - zuul: openstack/openstack-helm-infra
-    vars:
-      osh_openstack_release: train
-      zuul_osh_infra_relative_path: ../openstack-helm-infra/
-    timeout: 7200
-    pre-run:
-      - tools/gate/playbooks/osh-infra-upgrade-host.yaml
-      - tools/gate/playbooks/osh-infra-deploy-docker.yaml
-      - tools/gate/playbooks/osh-infra-build.yaml
-      - tools/gate/playbooks/osh-infra-deploy-k8s.yaml
-    run: tools/gate/playbooks/multinode-deploy.yaml
-    post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml
-    required-projects:
-      - openstack/openstack-helm-infra
-
-- job:
-    timeout: 9600
-    name: openstack-helm-armada-deploy
-    parent: openstack-helm-infra-functional
-    nodeset: openstack-helm-five-node-ubuntu
-    roles:
-      - zuul: openstack/openstack-helm-infra
-    pre-run:
-      - tools/gate/playbooks/osh-infra-upgrade-host.yaml
-      - tools/gate/playbooks/osh-infra-deploy-docker.yaml
-      - tools/gate/playbooks/osh-infra-build.yaml
-      - tools/gate/playbooks/osh-infra-deploy-k8s.yaml
-    post-run:
-      - tools/gate/playbooks/osh-infra-collect-logs.yaml
-      - tools/gate/playbooks/gather-armada-manifests.yaml
-    required-projects:
-      - openstack/openstack-helm-infra
-    vars:
-      zuul_osh_infra_relative_path: ../openstack-helm-infra/
-      gate_scripts_relative_path: ../openstack-helm
-      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:
-    timeout: 9600
-    name: openstack-helm-armada-update-uuid
-    parent: openstack-helm-infra-functional
-    nodeset: openstack-helm-five-node-ubuntu
-    roles:
-      - zuul: openstack/openstack-helm-infra
-    pre-run:
-      - tools/gate/playbooks/osh-infra-upgrade-host.yaml
-      - tools/gate/playbooks/osh-infra-deploy-docker.yaml
-      - tools/gate/playbooks/osh-infra-build.yaml
-      - tools/gate/playbooks/osh-infra-deploy-k8s.yaml
-    post-run:
-      - tools/gate/playbooks/osh-infra-collect-logs.yaml
-      - tools/gate/playbooks/gather-armada-manifests.yaml
-    required-projects:
-      - openstack/openstack-helm-infra
-    vars:
-      zuul_osh_infra_relative_path: ../openstack-helm-infra/
-      gate_scripts_relative_path: ../openstack-helm
-      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-uuid.sh
-
-- job:
-    timeout: 10800
-    name: openstack-helm-armada-update-passwords
-    parent: openstack-helm-infra-functional
-    nodeset: openstack-helm-five-node-ubuntu
-    roles:
-      - zuul: openstack/openstack-helm-infra
-    pre-run:
-      - tools/gate/playbooks/osh-infra-upgrade-host.yaml
-      - tools/gate/playbooks/osh-infra-deploy-docker.yaml
-      - tools/gate/playbooks/osh-infra-build.yaml
-      - tools/gate/playbooks/osh-infra-deploy-k8s.yaml
-    post-run:
-      - tools/gate/playbooks/osh-infra-collect-logs.yaml
-      - tools/gate/playbooks/gather-armada-manifests.yaml
-    required-projects:
-      - openstack/openstack-helm-infra
-    vars:
-      zuul_osh_infra_relative_path: ../openstack-helm-infra/
-      gate_scripts_relative_path: ../openstack-helm
-      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-multinode-temp-ubuntu
-    parent: openstack-helm-multinode-temp
-    nodeset: openstack-helm-five-node-ubuntu
-
-- job:
-    name: openstack-helm-multinode-temp-centos
-    parent: openstack-helm-multinode-temp
-    nodeset: openstack-helm-five-node-centos
-
-- job:
-    name: openstack-helm-multinode-temp-fedora
-    parent: openstack-helm-multinode-temp
-    nodeset: openstack-helm-five-node-fedora
-
-- job:
-    name: openstack-helm-ironic-ubuntu
-    parent: openstack-helm-multinode-temp
-    nodeset: openstack-helm-ubuntu
-    run: tools/gate/playbooks/ironic-deploy.yaml
-
-- job:
-    timeout: 10800
-    name: openstack-helm-multinode-temp-tempest
-    parent: openstack-helm-multinode-temp
-    nodeset: openstack-helm-five-node-ubuntu
-    run: tools/gate/playbooks/multinode-tempest-deploy.yaml
-
-- job:
-    timeout: 10800
-    name: openstack-helm-multinode-compute-kit-train-ubuntu_bionic
-    parent: openstack-helm-chart-deploy
-    nodeset: openstack-helm-five-node-ubuntu
-    vars:
-      zuul_osh_infra_relative_path: ../openstack-helm-infra/
-      osh_params:
-        openstack_release: train
-        container_distro_name: ubuntu
-        container_distro_version: bionic
-    pre-run:
-      - tools/gate/playbooks/multinode-base.yaml
-      - tools/gate/playbooks/osh-infra-upgrade-host.yaml
-      - tools/gate/playbooks/osh-infra-deploy-docker.yaml
-      - tools/gate/playbooks/osh-infra-build.yaml
-      - tools/gate/playbooks/osh-infra-deploy-k8s.yaml
-    run: tools/gate/playbooks/multinode-deploy-compute-kit.yaml
-
-- job:
-    timeout: 9600
-    name: openstack-helm-multinode-cinder-train-ubuntu_bionic
-    parent: openstack-helm-chart-deploy
-    nodeset: openstack-helm-five-node-ubuntu
-    vars:
-      zuul_osh_infra_relative_path: ../openstack-helm-infra/
-      osh_params:
-        openstack_release: train
-        container_distro_name: ubuntu
-        container_distro_version: bionic
-    pre-run:
-      - tools/gate/playbooks/multinode-base.yaml
-      - tools/gate/playbooks/osh-infra-upgrade-host.yaml
-      - tools/gate/playbooks/osh-infra-deploy-docker.yaml
-      - tools/gate/playbooks/osh-infra-build.yaml
-      - tools/gate/playbooks/osh-infra-deploy-k8s.yaml
-    run: tools/gate/playbooks/multinode-deploy-cinder.yaml

zuul.d/project.yaml

@@ -13,11 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# For having the full context, this file should be read
+# Full context: this file should be used with the openstack-helm-infra
-# with the openstack-helm-infra repository, where nodesets
+# repository, where nodesets and jobs are defined.
-# and jobs are defined.
-# NOTE(evrardjp): Some jobs and playbooks haven't been
-# migrated to openstack-helm-infra yet.
 - project:
     templates:
       - publish-openstack-docs-pti
@@ -57,21 +54,6 @@
     experimental:
       jobs:
         - openstack-helm-apparmor
-        - openstack-helm-tls
         - openstack-helm-apparmor-cinder
         - openstack-helm-netpol-compute-kit
-        - openstack-helm-netpol-compute-kit-train
-        - openstack-helm-netpol-compute-kit-ussuri
         - openstack-helm-netpol-cinder
-        - openstack-helm-multinode-compute-kit-train-ubuntu_bionic
-        - openstack-helm-multinode-cinder-train-ubuntu_bionic
-        # NOTE(srwilkers): Disabling the following jobs until
-        # issues with the kubeadm-aio based deployments are addressed
-        # - openstack-helm-multinode-temp-ubuntu
-        # - openstack-helm-multinode-temp-centos
-        # - openstack-helm-multinode-temp-fedora
-        # - openstack-helm-multinode-temp-tempest
-        # - openstack-helm-armada-deploy
-        # - openstack-helm-armada-update-uuid
-        # - openstack-helm-armada-update-passwords
-        # - openstack-helm-ironic-ubuntu