From cb4e6d75fc825457891990af38a733b9e0ecd2f5 Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Tue, 9 May 2023 13:14:52 +0000 Subject: [PATCH] Uplift shipyard and airflow focal images This PS uplifts shipyard and airflow images based on focal. Change-Id: Id212f1e99cc8bdcb5d46f31df18c70d941224150 --- .../osh/openstack-memcached/memcached.yaml | 2 +- global/software/config/versions.yaml | 61 ++++++++++--------- site/airskiff/software/config/versions.yaml | 8 +-- .../developer/030-armada-bootstrap.sh | 2 +- .../gate/playbooks/airskiff-deploy-gate.yaml | 1 + 5 files changed, 38 insertions(+), 36 deletions(-) diff --git a/global/software/charts/osh/openstack-memcached/memcached.yaml b/global/software/charts/osh/openstack-memcached/memcached.yaml index 6b2fac9d9..5055b449f 100644 --- a/global/software/charts/osh/openstack-memcached/memcached.yaml +++ b/global/software/charts/osh/openstack-memcached/memcached.yaml @@ -80,4 +80,4 @@ data: namespace: memcached-htk values: {} dependencies: [] -... +... \ No newline at end of file diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml index a9361763d..1f213431d 100644 --- a/global/software/config/versions.yaml +++ b/global/software/config/versions.yaml @@ -332,99 +332,99 @@ data: type: git ucp: armada: - location: http://localhost:8282/armada.tgz + location: http://control-plane.minikube.internal:8282/armada.tgz subpath: armada type: tar barbican: - location: http://localhost:8282/barbican.tgz + location: http://control-plane.minikube.internal:8282/barbican.tgz subpath: barbican type: tar ceph-client: - location: http://localhost:8282/ceph-client.tgz + location: http://control-plane.minikube.internal:8282/ceph-client.tgz subpath: ceph-client type: tar ceph-mon: - location: http://localhost:8282/ceph-mon.tgz + location: http://control-plane.minikube.internal:8282/ceph-mon.tgz subpath: ceph-mon type: tar ceph-osd: - location: http://localhost:8282/ceph-osd.tgz + location: http://control-plane.minikube.internal:8282/ceph-osd.tgz subpath: ceph-osd type: tar ceph-provisioners: - location: http://localhost:8282/ceph-provisioners.tgz + location: http://control-plane.minikube.internal:8282/ceph-provisioners.tgz subpath: ceph-provisioners type: tar ceph-rgw: - location: http://localhost:8282/ceph-rgw.tgz + location: http://control-plane.minikube.internal:8282/ceph-rgw.tgz subpath: ceph-rgw type: tar deckhand: - location: http://localhost:8282/deckhand.tgz + location: http://control-plane.minikube.internal:8282/deckhand.tgz subpath: deckhand type: tar divingbell: - location: http://localhost:8282/divingbell.tgz + location: http://control-plane.minikube.internal:8282/divingbell.tgz subpath: divingbell type: tar drydock: - location: http://localhost:8282/drydock.tgz + location: http://control-plane.minikube.internal:8282/drydock.tgz subpath: drydock type: tar ingress: - location: http://localhost:8282/ingress.tgz + location: http://control-plane.minikube.internal:8282/ingress.tgz subpath: ingress type: tar keystone: - location: http://localhost:8282/keystone.tgz + location: http://control-plane.minikube.internal:8282/keystone.tgz subpath: keystone type: tar maas: - location: http://localhost:8282/maas.tgz + location: http://control-plane.minikube.internal:8282/maas.tgz subpath: maas type: tar mariadb: - location: http://localhost:8282/mariadb.tgz + location: http://control-plane.minikube.internal:8282/mariadb.tgz subpath: mariadb type: tar memcached: - location: http://localhost:8282/memcached.tgz + location: http://control-plane.minikube.internal:8282/memcached.tgz subpath: memcached type: tar postgresql: - location: http://localhost:8282/postgresql.tgz + location: http://control-plane.minikube.internal:8282/postgresql.tgz subpath: postgresql type: tar promenade: - location: http://localhost:8282/promenade.tgz + location: http://control-plane.minikube.internal:8282/promenade.tgz subpath: promenade type: tar rabbitmq: - location: http://localhost:8282/rabbitmq.tgz + location: http://control-plane.minikube.internal:8282/rabbitmq.tgz subpath: rabbitmq type: tar shipyard: - location: http://localhost:8282/shipyard.tgz + location: http://control-plane.minikube.internal:8282/shipyard.tgz subpath: shipyard type: tar tenant-ceph-client: - location: http://localhost:8282/ceph-client.tgz + location: http://control-plane.minikube.internal:8282/ceph-client.tgz subpath: ceph-client type: tar tenant-ceph-mon: - location: http://localhost:8282/ceph-mon.tgz + location: http://control-plane.minikube.internal:8282/ceph-mon.tgz subpath: ceph-mon type: tar tenant-ceph-osd: - location: http://localhost:8282/ceph-osd.tgz + location: http://control-plane.minikube.internal:8282/ceph-osd.tgz subpath: ceph-osd type: tar tenant-ceph-provisioners: - location: http://localhost:8282/ceph-provisioners.tgz + location: http://control-plane.minikube.internal:8282/ceph-provisioners.tgz subpath: ceph-provisioners type: tar tenant-ceph-rgw: - location: http://localhost:8282/ceph-rgw.tgz + location: http://control-plane.minikube.internal:8282/ceph-rgw.tgz subpath: ceph-rgw type: tar tiller: @@ -746,6 +746,7 @@ data: dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 memcached: docker.io/library/memcached:1.5.5 prometheus_memcached_exporter: docker.io/prom/memcached-exporter:v0.4.1 + image_repo_sync: docker.io/library/docker:17.07.0 neutron: bootstrap: docker.io/openstackhelm/heat:ocata-ubuntu_xenial db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial @@ -982,8 +983,8 @@ data: ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal scripted_test: docker.io/openstackhelm/mariadb:ubuntu_focal-20210415 memcached: - dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0' - memcached: 'docker.io/library/memcached:1.5.5' + dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 + memcached: docker.io/library/memcached:1.5.5 prometheus_memcached_exporter: docker.io/prom/memcached-exporter:v0.4.1 image_repo_sync: docker.io/library/docker:17.07.0 pegleg: @@ -1013,15 +1014,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 diff --git a/site/airskiff/software/config/versions.yaml b/site/airskiff/software/config/versions.yaml index fbb924d7c..ecfb7001a 100644 --- a/site/airskiff/software/config/versions.yaml +++ b/site/airskiff/software/config/versions.yaml @@ -23,8 +23,8 @@ data: deckhand: 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" ... diff --git a/tools/deployment/airskiff/developer/030-armada-bootstrap.sh b/tools/deployment/airskiff/developer/030-armada-bootstrap.sh index 168fee12d..162e844ea 100755 --- a/tools/deployment/airskiff/developer/030-armada-bootstrap.sh +++ b/tools/deployment/airskiff/developer/030-armada-bootstrap.sh @@ -34,7 +34,7 @@ sudo chmod 0644 airskiff.yaml # sudo chmod 0644 ~/.kube/config # start http server with artifacts -docker rm artifacts --force | true +docker rm artifacts --force || true docker run --name artifacts -p 8282:80 -v $(pwd)/../artifacts:/usr/share/nginx/html -d nginx # Download latest Armada image and deploy Airship components diff --git a/tools/gate/playbooks/airskiff-deploy-gate.yaml b/tools/gate/playbooks/airskiff-deploy-gate.yaml index a50bc5d61..ff58c41f3 100644 --- a/tools/gate/playbooks/airskiff-deploy-gate.yaml +++ b/tools/gate/playbooks/airskiff-deploy-gate.yaml @@ -18,6 +18,7 @@ # - disable-systemd-resolved tasks: + - name: Clone dependencies shell: | set -ex