Update airskiff to focal

The following Airship images were uplifted to latest-ubuntu_focal:
- promenade
- drydock
- deckhand
- pegleg

Also openstack-helm-infra commit ip has been updated to
97ce6d7d8e9a090c748800d69a57bbd9af698b60

Change-Id: I18b1e8fb86d275ac937508caa1923dfb79c901a0

.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

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,83 +251,83 @@ 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:
@@ -434,7 +434,7 @@ data:
         type: git
       tiller-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
+        reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
         subpath: helm-toolkit
         type: git
     utility:
@@ -913,8 +913,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
@@ -922,7 +922,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
@@ -987,7 +987,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
@@ -998,7 +998,7 @@ data:
         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

site/airskiff/software/config/versions.yaml

@@ -19,9 +19,9 @@ 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"