From 65421815e1395ea1c2ac060b6183bcad1094e250 Mon Sep 17 00:00:00 2001
From: Sergiy Markin <smarkin@mirantis.com>
Date: Mon, 23 Dec 2024 06:28:13 +0000
Subject: [PATCH] Uplifted dependencies

Change-Id: I8ce27bd9323b1580e3bb9ac155bd96cf90fe6c05
---
 .zuul.yaml                            | 8 +-------
 images/pegleg/Dockerfile.ubuntu_jammy | 2 +-
 requirements-direct.txt               | 6 +++---
 requirements-frozen.txt               | 6 +++---
 vcs-requirements.env                  | 6 +++---
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index b41710e3..0d0bc0ff 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -24,7 +24,7 @@
       docker_registry_login_url: "https://quay.io/api/v1/"
       deb_docker_repo: "{{ zuul_site_mirror_fqdn }}/deb-docker/{{ ansible_distribution_release }}"
       image_prefix: "airshipit"
-      base_image_jammy: "public.ecr.aws/ubuntu/ubuntu:jammy"
+      base_image_jammy: "quay.io/airshipit/ubuntu:jammy"
       base_image_focal: "ubuntu:20.04"
       base_image_bionic: "ubuntu:18.04"
       base_image_opensuse: "opensuse/leap:15.1"
@@ -34,7 +34,6 @@
         - openstack-tox-py310
         - openstack-tox-pep8-jammy
         - openstack-tox-cover-jammy
-        # - openstack-tox-docs-jammy
         - pegleg-dependency-vulnerability-check
         - airship-pegleg-validate-airskiff-manifests-jammy
         - airship-pegleg-docker-build-gate-ubuntu_jammy
@@ -45,7 +44,6 @@
         - openstack-tox-py310
         - openstack-tox-pep8-jammy
         - openstack-tox-cover-jammy
-        # - openstack-tox-docs-jammy
         - pegleg-dependency-vulnerability-check
         - airship-pegleg-validate-airskiff-manifests-jammy
         - airship-pegleg-docker-build-gate-ubuntu_jammy
@@ -73,10 +71,6 @@
     parent: openstack-tox-pep8
     nodeset: openstack-single-node-jammy
 
-# - job:
-#     name: openstack-tox-docs-jammy
-#     parent: openstack-tox-docs
-#     nodeset: openstack-single-node-jammy
 
 - job:
     name: openstack-tox-cover-jammy
diff --git a/images/pegleg/Dockerfile.ubuntu_jammy b/images/pegleg/Dockerfile.ubuntu_jammy
index 2793ee21..a237fb9c 100644
--- a/images/pegleg/Dockerfile.ubuntu_jammy
+++ b/images/pegleg/Dockerfile.ubuntu_jammy
@@ -4,7 +4,7 @@
 # 429 Too Many Requests - Server message: too many requests:
 #   You have reached your pull rate limit.
 #   You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit
-ARG FROM=public.ecr.aws/docker/library/ubuntu:jammy
+ARG FROM=quay.io/airshipit/ubuntu:jammy
 FROM ${FROM}
 ARG CFSSLURL=https://pkg.cfssl.org/R1.2/cfssl_linux-amd64
 
diff --git a/requirements-direct.txt b/requirements-direct.txt
index b90dc8b4..fd195c6b 100644
--- a/requirements-direct.txt
+++ b/requirements-direct.txt
@@ -10,9 +10,9 @@ zipp
 psycopg2-binary
 
 # Airship dependencies
-deckhand @ git+https://opendev.org/airship/deckhand.git@4d500e48e880ea7f9a3582324c55c61373a855ea#egg=deckhand
-shipyard-client @ git+https://opendev.org/airship/shipyard.git@2fb62659c5a3eecafcf0d0dedaabf2a00fc5d88f#egg=shipyard-client&subdirectory=src/bin/shipyard_client
-promenade @ git+https://opendev.org/airship/promenade.git@e491bc4ca7a9764325ab4a2cf1ae10daf6a26efb#egg=promenade
+deckhand @ git+https://opendev.org/airship/deckhand.git@211b2d20c080ec806d196f3ec6b0d0472b00fa1b#egg=deckhand
+shipyard-client @ git+https://opendev.org/airship/shipyard.git@40b424e82a6880136541af18b9b5752b4ebd9c96#egg=shipyard-client&subdirectory=src/bin/shipyard_client
+promenade @ git+https://opendev.org/airship/promenade.git@40fd108fd976c19bc142d10cc52b24d48de37100#egg=promenade
 
 
 # Openstack Caracal 2024.1
diff --git a/requirements-frozen.txt b/requirements-frozen.txt
index 1d2e0df8..b643c900 100644
--- a/requirements-frozen.txt
+++ b/requirements-frozen.txt
@@ -17,7 +17,7 @@ cliff==4.8.0
 cmd2==2.5.8
 cryptography==42.0.8
 debtcollector==3.0.0
-Deckhand @ git+https://opendev.org/airship/deckhand.git@4d500e48e880ea7f9a3582324c55c61373a855ea
+Deckhand @ git+https://opendev.org/airship/deckhand.git@211b2d20c080ec806d196f3ec6b0d0472b00fa1b
 decorator==5.1.1
 deepdiff==8.1.1
 dnspython==2.7.0
@@ -84,7 +84,7 @@ pecan==1.5.1
 pip==24.1
 ply==3.11
 prettytable==3.12.0
-promenade @ git+https://opendev.org/airship/promenade.git@e491bc4ca7a9764325ab4a2cf1ae10daf6a26efb
+promenade @ git+https://opendev.org/airship/promenade.git@40fd108fd976c19bc142d10cc52b24d48de37100
 prometheus_client==0.21.1
 psycopg2-binary==2.9.10
 PTable==0.9.2
@@ -115,7 +115,7 @@ rpds-py==0.22.3
 rsa==4.9
 selector==0.10.1
 setuptools==70.1.0
-shipyard_client @ git+https://opendev.org/airship/shipyard.git@2fb62659c5a3eecafcf0d0dedaabf2a00fc5d88f#subdirectory=src/bin/shipyard_client
+shipyard_client @ git+https://opendev.org/airship/shipyard.git@40b424e82a6880136541af18b9b5752b4ebd9c96#subdirectory=src/bin/shipyard_client
 simplejson==3.19.3
 six==1.17.0
 smmap==5.0.1
diff --git a/vcs-requirements.env b/vcs-requirements.env
index 4b474766..2b9239c0 100644
--- a/vcs-requirements.env
+++ b/vcs-requirements.env
@@ -1,3 +1,3 @@
-DECKHAND_VERSION=commit/4d500e48e880ea7f9a3582324c55c61373a855ea
-SHIPYARD_VERSION=commit/2fb62659c5a3eecafcf0d0dedaabf2a00fc5d88f
-PROMENADE_VERSION=commit/e491bc4ca7a9764325ab4a2cf1ae10daf6a26efb
+DECKHAND_VERSION=commit/211b2d20c080ec806d196f3ec6b0d0472b00fa1b
+SHIPYARD_VERSION=commit/40b424e82a6880136541af18b9b5752b4ebd9c96
+PROMENADE_VERSION=commit/40fd108fd976c19bc142d10cc52b24d48de37100