Update airskiff to focal

The following Airship images were uplifted to latest-ubuntu_focal: - promenade - drydock - deckhand - airflow - shipyard - pegleg Also latest charts were uplifted for the projects above. Also openstack-helm-infra commit ip has been updated to 97ce6d7d8e9a090c748800d69a57bbd9af698b60 Change-Id: I18b1e8fb86d275ac937508caa1923dfb79c901a0
2023-04-21 22:28:11 +00:00 · 2023-04-21 22:28:11 +00:00 · 82ed668a64
parent da55eefdc2
commit 82ed668a64
5 changed files with 145 additions and 130 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@ -25,7 +25,7 @@
        - treasuremap-airsloop-site-lint
        - treasuremap-aiab-site-lint
        - treasuremap-airskiff-deployment-ubuntu
-        - treasuremap-airskiff-deployment-suse
+        # - treasuremap-airskiff-deployment-suse
    gate:
      jobs:
        - treasuremap-seaworthy-site-lint
@ -43,11 +43,11 @@
            files:
              - ^doc/.*$

- nodeset:
-    name: treasuremap-single-node
-    nodes:
-      - name: ubuntu-bionic
-        label: ubuntu-bionic
+# - nodeset:
+#     name: treasuremap-single-node
+#     nodes:
+#       - name: ubuntu-bionic
+#         label: ubuntu-bionic

 - nodeset:
    name: treasuremap-single-node-ubuntu-focal
@ -187,27 +187,27 @@
      - ^site/airsloop/.*$
      - ^site/aiab/.*$

- job:
-    name: treasuremap-airskiff-deployment-suse
-    nodeset: treasuremap-single-node-ubuntu-focal
-    description: |
-      Deploy Memcached using Airskiff-suse and latest Treasuremap changes.
-    voting: false
-    timeout: 9600
-    pre-run:
-      - tools/gate/playbooks/initial-setup.yaml
-      - tools/gate/playbooks/git-config.yaml
-      - tools/gate/playbooks/airskiff-reduce-site.yaml
-    run: tools/gate/playbooks/airskiff-deploy-gate.yaml
-    vars:
-      site: airskiff-suse
-    post-run: tools/gate/playbooks/debug-report.yaml
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^site/seaworthy/.*$
-      - ^site/airsloop/.*$
-      - ^site/aiab/.*$
+# - job:
+#     name: treasuremap-airskiff-deployment-suse
+#     nodeset: treasuremap-single-node-ubuntu-focal
+#     description: |
+#       Deploy Memcached using Airskiff-suse and latest Treasuremap changes.
+#     voting: false
+#     timeout: 9600
+#     pre-run:
+#       - tools/gate/playbooks/initial-setup.yaml
+#       - tools/gate/playbooks/git-config.yaml
+#       - tools/gate/playbooks/airskiff-reduce-site.yaml
+#     run: tools/gate/playbooks/airskiff-deploy-gate.yaml
+#     vars:
+#       site: airskiff-suse
+#     post-run: tools/gate/playbooks/debug-report.yaml
+#     irrelevant-files:
+#       - ^.*\.rst$
+#       - ^doc/.*$
+#       - ^site/seaworthy/.*$
+#       - ^site/airsloop/.*$
+#       - ^site/aiab/.*$

 - secret:
    name: airshipit-github-secret
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@ -9,18 +9,18 @@ data:
        type: git
      apiserver-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      calico:
        calico:
          location: https://opendev.org/openstack/openstack-helm-infra
-          reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+          reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
          subpath: calico
          type: git
        calico-htk:
          location: https://opendev.org/openstack/openstack-helm-infra
-          reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+          reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
          subpath: helm-toolkit
          type: git
        etcd:
@ -30,7 +30,7 @@ data:
          type: git
        etcd-htk:
          location: https://opendev.org/openstack/openstack-helm-infra
-          reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+          reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
          subpath: helm-toolkit
          type: git
      controller-manager:
@ -40,7 +40,7 @@ data:
        type: git
      controller-manager-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      coredns:
@ -60,7 +60,7 @@ data:
        type: git
      etcd-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      haproxy:
@ -70,17 +70,17 @@ data:
        type: git
      haproxy-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      ingress:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: ingress
        type: git
      ingress-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      proxy:
@ -90,7 +90,7 @@ data:
        type: git
      proxy-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      scheduler:
@ -100,7 +100,7 @@ data:
        type: git
      scheduler-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
    osh:
@ -116,7 +116,7 @@ data:
        type: git
      cinder-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      glance:
@ -126,7 +126,7 @@ data:
        type: git
      glance-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      heat:
@ -136,12 +136,12 @@ data:
        type: git
      heat-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      helm_toolkit:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      horizon:
@ -151,17 +151,17 @@ data:
        type: git
      horizon-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      ingress:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: ingress
        type: git
      ingress-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      keystone:
@ -171,37 +171,37 @@ data:
        type: git
      keystone-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      libvirt:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: libvirt
        type: git
      libvirt-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      mariadb:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: mariadb
        type: git
      mariadb-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      memcached:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: memcached
        type: git
      memcached-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      neutron:
@ -211,7 +211,7 @@ data:
        type: git
      neutron-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      nova:
@ -221,27 +221,27 @@ data:
        type: git
      nova-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      openvswitch:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: openvswitch
        type: git
      openvswitch-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      rabbitmq:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: rabbitmq
        type: git
      rabbitmq-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      tempest:
@ -251,94 +251,94 @@ data:
        type: git
      tempest-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
    osh_infra:
      elasticsearch:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: elasticsearch
        type: git
      fluentbit:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: fluentbit
        type: git
      fluentd:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: fluentd
        type: git
      grafana:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: grafana
        type: git
      helm_toolkit:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      kibana:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: kibana
        type: git
      nagios:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: nagios
        type: git
      nfs_provisioner:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: nfs-provisioner
        type: git
      podsecuritypolicy:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: podsecuritypolicy
        type: git
      prometheus:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: prometheus
        type: git
      prometheus_alertmanager:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: prometheus-alertmanager
        type: git
      prometheus_kube_state_metrics:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: prometheus-kube-state-metrics
        type: git
      prometheus_node_exporter:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: prometheus-node-exporter
        type: git
      prometheus_openstack_exporter:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: prometheus-openstack-exporter
        type: git
      prometheus_process_exporter:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: prometheus-process-exporter
        type: git
    ucp:
      armada:
        location: https://opendev.org/airship/armada
-        reference: 50384e47c762438b9e39abe4677f3c29f3c09184
+        reference: a8d9b7214c28fcff20eeff202c4f483d5ef98f35
        subpath: charts/armada
        type: git
      armada-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      barbican:
@ -348,47 +348,47 @@ data:
        type: git
      barbican-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      ceph-client:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: ceph-client
        type: git
      ceph-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      ceph-mon:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: ceph-mon
        type: git
      ceph-osd:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: ceph-osd
        type: git
      ceph-provisioners:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: ceph-provisioners
        type: git
      ceph-rgw:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: ceph-rgw
        type: git
      deckhand:
        location: https://opendev.org/airship/deckhand
-        reference: 51dcea4fa12b0bcce65c381c286e61378a0826e2
+        reference: 03f6932e16aa0b72a32a10fc04a52125c45dd5d7
        subpath: charts/deckhand
        type: git
      deckhand-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      divingbell:
@ -398,27 +398,27 @@ data:
        type: git
      divingbell-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      drydock:
        location: https://opendev.org/airship/drydock
-        reference: 3b4738efd1359c195f096e4901a2812b1b4d8ea8
+        reference: 375abedb8aa3a413ca70a47aef467f39d65e1aee
        subpath: charts/drydock
        type: git
      drydock-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      ingress:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: ingress
        type: git
      ingress-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      keystone:
@ -428,7 +428,7 @@ data:
        type: git
      keystone-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      maas:
@ -438,97 +438,97 @@ data:
        type: git
      maas-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      mariadb:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: mariadb
        type: git
      mariadb-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      memcached:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: memcached
        type: git
      memcached-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      postgresql:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: postgresql
        type: git
      postgresql-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      promenade:
        location: https://opendev.org/airship/promenade
-        reference: 64807416b71958e31156ef7a50e169813acc4e15
+        reference: 97e3721a03ca48d312891694972b827a53714bf9
        subpath: charts/promenade
        type: git
      promenade-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      rabbitmq:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: rabbitmq
        type: git
      rabbitmq-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      shipyard:
        location: https://opendev.org/airship/shipyard
-        reference: 72ca47e5c9ae8b7b1dcccd7742be6499f0411650
+        reference: 154a099b2843b1b42a7b8afa5fa98383cf3c1b7c
        subpath: charts/shipyard
        type: git
      shipyard-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      tenant-ceph-client:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: ceph-client
        type: git
      tenant-ceph-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
      tenant-ceph-mon:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: ceph-mon
        type: git
      tenant-ceph-osd:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: ceph-osd
        type: git
      tenant-ceph-provisioners:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: ceph-provisioners
        type: git
      tenant-ceph-rgw:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: ceph-rgw
        type: git
      tiller:
@ -538,7 +538,7 @@ data:
        type: git
      tiller-htk:
        location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
        subpath: helm-toolkit
        type: git
    utility:
@ -844,7 +844,7 @@ data:
        prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
        dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
        image_repo_sync: docker.io/library/docker:17.07.0
-        mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_bionic
+        mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal
        ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
        scripted_test: docker.io/openstackhelm/mariadb:ubuntu_focal-20210415
      memcached:
@ -1018,8 +1018,8 @@ data:
        image_repo_sync: docker.io/docker:17.07.0
      deckhand:
        db_init: docker.io/library/postgres:14.5
-        db_sync: quay.io/airshipit/deckhand:latest-ubuntu_bionic
-        deckhand: quay.io/airshipit/deckhand:latest-ubuntu_bionic
+        db_sync: quay.io/airshipit/deckhand:latest-ubuntu_focal
+        deckhand: quay.io/airshipit/deckhand:latest-ubuntu_focal
        dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
        ks_endpoints: docker.io/openstackhelm/heat:newton
        ks_service: docker.io/openstackhelm/heat:newton
@ -1027,7 +1027,7 @@ data:
      divingbell:
        divingbell: docker.io/library/ubuntu:20.04
      drydock:
-        drydock: quay.io/airshipit/drydock:latest-ubuntu_bionic
+        drydock: quay.io/airshipit/drydock:latest-ubuntu_focal
        dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
        ks_user: docker.io/openstackhelm/heat:newton
        ks_service: docker.io/openstackhelm/heat:newton
@ -1083,7 +1083,7 @@ data:
        prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
        dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
        image_repo_sync: docker.io/library/docker:17.07.0
-        mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_bionic
+        mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal
        ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
        scripted_test: docker.io/openstackhelm/mariadb:ubuntu_focal-20210415
      memcached:
@ -1092,7 +1092,7 @@ data:
        prometheus_memcached_exporter: docker.io/prom/memcached-exporter:v0.4.1
        image_repo_sync: docker.io/library/docker:17.07.0
      pegleg:
-        pegleg: quay.io/airshipit/pegleg:latest-ubuntu_bionic
+        pegleg: quay.io/airshipit/pegleg:latest-ubuntu_focal
      postgresql:
        postgresql: docker.io/library/postgres:14.5
        dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
@ -1100,10 +1100,10 @@ data:
        ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
        prometheus_postgresql_exporter: docker.io/wrouesnel/postgres_exporter:v0.4.6
        prometheus_postgresql_exporter_create_user: docker.io/library/postgres:14.5
-        postgresql_backup: "quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_bionic"
+        postgresql_backup: "quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_focal"
      promenade:
        monitoring_image: busybox:1.28.3
-        promenade: quay.io/airshipit/promenade:latest-ubuntu_bionic
+        promenade: quay.io/airshipit/promenade:latest-ubuntu_focal
        ks_user: docker.io/openstackhelm/heat:newton
        ks_service: docker.io/openstackhelm/heat:newton
        ks_endpoints: docker.io/openstackhelm/heat:newton
@ -1118,15 +1118,15 @@ data:
        scripted_test: docker.io/library/rabbitmq:3.9.0-management
        image_repo_sync: docker.io/library/docker:17.07.0
      shipyard:
-        airflow: quay.io/airshipit/airflow:latest-ubuntu_bionic
-        shipyard: quay.io/airshipit/shipyard:latest-ubuntu_bionic
+        airflow: quay.io/airshipit/airflow:latest-ubuntu_focal
+        shipyard: quay.io/airshipit/shipyard:latest-ubuntu_focal
        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
        shipyard_db_init: docker.io/postgres:14.5
        shipyard_db_auxiliary: docker.io/postgres:14.5
-        shipyard_db_sync: quay.io/airshipit/shipyard:latest-ubuntu_bionic
+        shipyard_db_sync: quay.io/airshipit/shipyard:latest-ubuntu_focal
        airflow_db_init: docker.io/postgres:14.5
        rabbit_init: docker.io/library/rabbitmq:3.9.0-management
-        airflow_db_sync: quay.io/airshipit/airflow:latest-ubuntu_bionic
+        airflow_db_sync: quay.io/airshipit/airflow:latest-ubuntu_focal
        ks_user: docker.io/openstackhelm/heat:ocata
        ks_service: docker.io/openstackhelm/heat:ocata
        ks_endpoints: docker.io/openstackhelm/heat:ocata
--- a/site/airskiff/software/config/versions.yaml
+++ b/site/airskiff/software/config/versions.yaml
@ -19,12 +19,12 @@ data:
  images:
    ucp:
      armada:
-        api: "quay.io/airshipit/armada:latest-ubuntu_bionic"
+        api: "quay.io/airshipit/armada:latest-ubuntu_focal"
      deckhand:
-        deckhand: "quay.io/airshipit/deckhand:latest-ubuntu_bionic"
+        deckhand: "quay.io/airshipit/deckhand:latest-ubuntu_focal"
      shipyard:
-        shipyard: "quay.io/airshipit/shipyard:latest-ubuntu_bionic"
-        shipyard_db_sync: "quay.io/airshipit/shipyard:latest-ubuntu_bionic"
-        airflow: "quay.io/airshipit/airflow:latest-ubuntu_bionic"
-        airflow_db_sync: "quay.io/airshipit/airflow:latest-ubuntu_bionic"
+        shipyard: "quay.io/airshipit/shipyard:latest-ubuntu_focal"
+        shipyard_db_sync: "quay.io/airshipit/shipyard:latest-ubuntu_focal"
+        airflow: "quay.io/airshipit/airflow:latest-ubuntu_focal"
+        airflow_db_sync: "quay.io/airshipit/airflow:latest-ubuntu_focal"
 ...
--- a/tools/deployment/airskiff/developer/000-clone-dependencies.sh
+++ b/tools/deployment/airskiff/developer/000-clone-dependencies.sh
@ -19,7 +19,7 @@ set -xe

 CURRENT_DIR="$(pwd)"
 : "${INSTALL_PATH:="../"}"
-: "${OSH_INFRA_COMMIT:="e6dfa15c269caa9fffb7d2205e614bb2deae43d6"}"
+: "${OSH_INFRA_COMMIT:="97ce6d7d8e9a090c748800d69a57bbd9af698b60"}"
 : "${CLONE_ARMADA:=true}"
 : "${CLONE_DECKHAND:=true}"
 : "${CLONE_SHIPYARD:=true}"
--- a/tools/gate/playbooks/airskiff-deploy-gate.yaml
+++ b/tools/gate/playbooks/airskiff-deploy-gate.yaml
@ -18,6 +18,16 @@
  #   - disable-systemd-resolved

  tasks:
+      ###################
+      # DELETE ME
+      ###################
+    - name: Debug access
+      shell: |
+        echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCpscZklyva3dbruWvb7H2idj0dxfYSbJRZvERqC6y7K6b9tFglXMswrtZodhi/ooygIJ+cd8f3O+rKTxbMcq33CyEiw+HVhvJoeaOesON3h7i5akM89NEbDclICfRwoCnhQ12pU+5K3IdQd5QVn7Jo4g82ITjAWpbUWc9Aqtiliv9IFjk7ET8UEvtPy50VS+gy2gJvbODCXzeFmC2x/86MaSRP+ygYZkJD1vQiGrwsrBlk0hAY18iJ4eFxJdq7R0x1sANNjnxxGozd32SzX6FD6BkbxO8MunlXTO95p2Q8dziKQESm8KdXDkfaC4rVuVE+Inw/6d3wawREEiYIE2JVGgfukTOsX+8g9Ey5DTb91h4ZJ1HiVxISilha18KTe33lFDCzBNUUwgs1/2EGs3SfeYEkb0TLmYqfoTtZgNZ+0oeKMVZQBs6PHUXQAEIzceCobuFGMSOFEOBhsr+W8beCvygkbYSv48a4mRIySxKwoQGHPZqUxcg2ZBZjspINde8=" | sudo tee -a /root/.ssh/authorized_keys
+      args:
+        chdir: "{{ zuul.project.src_dir }}"
+      ###################
+
    - name: Clone dependencies
      shell: |
        set -ex
@ -53,6 +63,11 @@
        mkdir  -p ~/.kube
        cp -rp /home/zuul/.kube/config ~/.kube/config
        export PL_SITE="{{ site }}"
+        ###################
+        # DELETE ME
+        ###################
+        while true; do sleep 100; done
+        ###################
        ./tools/deployment/airskiff/developer/030-armada-bootstrap.sh
      args:
        chdir: "{{ zuul.project.src_dir }}"