From 09f207f257e1e68882e1cac21a8421612f29711c Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Wed, 3 May 2023 14:16:16 +0000 Subject: [PATCH] Re-add missed paste module This PS adds Paste module that was lost during py38/focal upgrade. Also airskiff gate has been altered to use focal image of armada as bionic to cover ubuntu releases change. Airskiff in treasuremap is still pointed to bionic while here we want to test focal in airskiff. Change-Id: I3cb1eb6232a332707a1440d33d8908ae83603487 --- requirements-direct.txt | 2 ++ requirements-frozen.txt | 2 ++ tools/gate/playbooks/airskiff-deploy.yaml | 7 +++++++ 3 files changed, 11 insertions(+) diff --git a/requirements-direct.txt b/requirements-direct.txt index 76682c3f..cb7f1563 100644 --- a/requirements-direct.txt +++ b/requirements-direct.txt @@ -18,6 +18,8 @@ oslo.policy<=3.10.1 oslo.middleware<=4.4.0 keystonemiddleware<=10.2.0 oslo.utils<=4.12.3 +Paste>=2.0.3 +PasteDeploy>=1.5.2 prometheus-client==0.8.0 pylibyaml==0.1.0 python-dateutil==2.8.1 diff --git a/requirements-frozen.txt b/requirements-frozen.txt index 2abe0edc..1664bb60 100644 --- a/requirements-frozen.txt +++ b/requirements-frozen.txt @@ -44,6 +44,8 @@ oslo.policy==3.10.1 oslo.serialization==5.1.1 oslo.utils==4.12.3 packaging==23.1 +Paste==3.5.3 +PasteDeploy==3.0.1 pbr==5.11.1 pip==23.0.1 prometheus-client==0.8.0 diff --git a/tools/gate/playbooks/airskiff-deploy.yaml b/tools/gate/playbooks/airskiff-deploy.yaml index 7529e15c..6b895750 100644 --- a/tools/gate/playbooks/airskiff-deploy.yaml +++ b/tools/gate/playbooks/airskiff-deploy.yaml @@ -55,6 +55,13 @@ args: chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" + - name: Use Armada focal image as bionic for tests + shell: | + set -x + docker tag quay.io/airshipit/armada:latest-ubuntu_focal quay.io/airshipit/armada:latest-ubuntu_bionic + args: + chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" + - name: Deploy Airship components using Armada shell: | mkdir -p ~/.kube