From b37417253f99f23549e09502e3bcd81d450bb4c4 Mon Sep 17 00:00:00 2001
From: Sean Eagan <seaneagan1@gmail.com>
Date: Fri, 3 Sep 2021 14:59:58 -0500
Subject: [PATCH] Gate fixes

- Fix helm CLI download URL, the previous URL is no longer available,
  and is superceded by get.helm.sh
- Fix jsonschema dependency spec, 4.x alpha versions were causing the
  unit tests to fail for python 3.5
- Remove oslo.db dependency as it was not used and one of its recursive
  dependencies (tempita) was failing during setup

Change-Id: I03e8a738bb8aad620903119638210077d211770c
---
 requirements.txt      | 3 +--
 tools/helm_install.sh | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index db84d2c4..2d61ca37 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ amqp<2.7,>=2.6.0
 deepdiff==3.3.0
 gitpython
 grpcio>=1.16.0
-jsonschema>=3.0.1<4
+jsonschema>=3.0.1,<4
 keystoneauth1>=3.18.0
 keystonemiddleware==5.3.0
 kombu<4.7,>=4.6.10
@@ -29,7 +29,6 @@ oslo.cache>=1.38.1 # Apache-2.0
 oslo.concurrency>=3.8.0 # Apache-2.0
 oslo.config>=7.0.0 # Apache-2.0
 oslo.context>=2.14.0 # Apache-2.0
-oslo.db>=4.24.0 # Apache-2.0
 oslo.i18n!=3.15.2,>=2.1.0 # Apache-2.0
 oslo.log>=3.45.2 # Apache-2.0
 oslo.messaging!=5.25.0,>=5.24.2 # Apache-2.0
diff --git a/tools/helm_install.sh b/tools/helm_install.sh
index bbef579e..02ead5f7 100755
--- a/tools/helm_install.sh
+++ b/tools/helm_install.sh
@@ -17,7 +17,7 @@
 set -x
 
 HELM=$1
-HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.16.9-linux-amd64.tar.gz"}
+HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v2.16.9-linux-amd64.tar.gz"}
 
 
 function install_helm_binary {