From ce50da79e7e1e6e26bee0e5533bc49cd4dce341d Mon Sep 17 00:00:00 2001 From: Phil Sphicas Date: Mon, 15 Feb 2021 02:59:53 +0000 Subject: [PATCH] Uplift promenade to support non-tar urls Uplifts promenade to a version that supports specifying a direct url as the source for a file in the HostSystem and Genesis schema. Complete list of promenade changes since the last uplift: * c9862e5 Allow url as source of file to be deployed to host * d161528 Avoid calico-etcd crashloop * 77c7624 Fix ubuntu_xenial build (use pip <21.0) * 630e504 Update to container image repo k8s.gcr.io * 5e70957 Merge "Makefile; clean should include .tox" * 946a28d Use HostToContainer mountPropagation * f29d6df Ignore upstream chart repos when installing Helm * 2f2a872 Makefile; clean should include .tox * 922e3b2 Uplift HTK for etcd backup/restore delete archive capability * de9f841 kube-apiserver: disable http2 Change-Id: Ia054136956d0a6c3ac24ae1658085a62157427ea --- Pipfile | 2 +- Pipfile.lock | 2 +- requirements.txt | 2 +- vcs-requirements.env | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Pipfile b/Pipfile index 6a839e20..1cd9f0ca 100644 --- a/Pipfile +++ b/Pipfile @@ -28,7 +28,7 @@ pylibyaml = "~=0.1" PyYAML = "~=5.1" deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "1f0c011a1708c1235a2be65edada7d386cd55d2a"} shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "35e5a7f796a5341e02fb0d3f2d27b41e2fb39131",subdirectory = "src/bin/shipyard_client"} -promenade = {git = "https://opendev.org/airship/promenade.git",ref = "eb748a75f3b4e183c106acc429778676c3e06f51"} +promenade = {git = "https://opendev.org/airship/promenade.git",ref = "c9862e5749986a671c274bbfad4366cb4609fa89"} "oslo.i18n" = "~=3.24.0" "oslo.utils" = ">=3.42.1" six = ">=1.15.0" diff --git a/Pipfile.lock b/Pipfile.lock index 826d9215..349e0cb8 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -722,7 +722,7 @@ }, "promenade": { "git": "https://opendev.org/airship/promenade.git", - "ref": "eb748a75f3b4e183c106acc429778676c3e06f51" + "ref": "c9862e5749986a671c274bbfad4366cb4609fa89" }, "psycopg2-binary": { "hashes": [ diff --git a/requirements.txt b/requirements.txt index be4946b3..8fd28acd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,7 +28,7 @@ fixtures==3.0.0 flake8==3.7.9 futurist==2.2.0; python_version >= '3.6' git+https://opendev.org/airship/deckhand.git@1f0c011a1708c1235a2be65edada7d386cd55d2a#egg=deckhand -git+https://opendev.org/airship/promenade.git@eb748a75f3b4e183c106acc429778676c3e06f51 +git+https://opendev.org/airship/promenade.git@c9862e5749986a671c274bbfad4366cb4609fa89 git+https://opendev.org/airship/shipyard.git@35e5a7f796a5341e02fb0d3f2d27b41e2fb39131#egg=shipyard-client&subdirectory=src/bin/shipyard_client gitdb2==2.0.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' gitpython==2.1.15 diff --git a/vcs-requirements.env b/vcs-requirements.env index 8dab29cb..dacadd50 100644 --- a/vcs-requirements.env +++ b/vcs-requirements.env @@ -1,3 +1,3 @@ DECKHAND_VERSION=commit/1f0c011a1708c1235a2be65edada7d386cd55d2a SHIPYARD_VERSION=commit/35e5a7f796a5341e02fb0d3f2d27b41e2fb39131 -PROMENADE_VERSION=commit/eb748a75f3b4e183c106acc429778676c3e06f51 +PROMENADE_VERSION=commit/c9862e5749986a671c274bbfad4366cb4609fa89