[WIP] Gate fixes for Shipyard

* Install older version of pip<21.0 for ubuntu_xenial images
* Install setuptools via pip for ubuntu_xenial images

Change-Id: Iee4ce59fdceacb165120a69d11c44e6e47feaea8

images/airflow/Dockerfile.ubuntu_xenial

@@ -69,13 +69,13 @@ RUN set -ex && \
     netcat \
     netbase \
     python3 \
-    python3-setuptools \
     python3-pip \
     python3-dev \
     python3-dateutil \
     make \
     --no-install-recommends \
-    && python3 -m pip install -U pip \
+    && python3 -m pip install -U 'pip<21.0' \
+    && python3 -m pip install -U setuptools \
     && apt-get clean \
     && rm -rf \
         /var/lib/apt/lists/* \

images/shipyard/Dockerfile.ubuntu_xenial

@@ -46,7 +46,6 @@ RUN set -ex && \
     make \
     netbase \
     python3-dev \
-    python3-setuptools \
     --no-install-recommends \
     && apt-get autoremove -yqq --purge \
     && apt-get clean \
@@ -101,7 +100,8 @@ COPY ${ctx_base}/shipyard_airflow /home/shipyard/shipyard/
     ' \
     && apt-get -qq update \
     && apt-get -y install -y $buildDeps --no-install-recommends \
-    && python3 -m pip install -U pip \
+    && python3 -m pip install -U 'pip<21.0' \
+    && python3 -m pip install -U setuptools \
     && pip3 install -r /home/shipyard/client_requirements.txt --no-cache-dir \
     && cd /home/shipyard/shipyard_client \
     && python3 setup.py install \

src/bin/shipyard_airflow/test-requirements.txt

@@ -7,7 +7,7 @@ responses==0.10.2
 testfixtures==5.1.1
 # Had to upgrade apache-airflow as 1.10.1 requires a version of jinja too old
 # for promenade
-apache-airflow[crypto,celery,hive,hdfs,jdbc]==1.10.2
+apache-airflow[crypto,celery,hive,hdfs,jdbc]==1.10.4
 # install postgres seperately as apache-airflow 1.10.2 forces postgres to use
 # psycopg2 instead of psycopg2-binary which requires additional apt packages
 # to be installed, i.e. postgres-devel. Otherwise the following error is seen:
@@ -16,7 +16,7 @@ postgres>=3.0.0
 
 # TODO(bryan-strassner) Pin to version for airflow when added to the
 # requirements.txt in the airflow images directory
-git+https://opendev.org/airship/promenade.git@master#egg=promenade
+#git+https://opendev.org/airship/promenade.git@master#egg=promenade
 
 # Linting
 flake8<3.8.0,>=3.6.0

src/bin/shipyard_airflow/tox.ini

@@ -12,6 +12,7 @@ skipsdist=True
 setenv=
   SLUGIFY_USES_TEXT_UNIDECODE=yes
 commands =
+  airflow initdb
   pytest \
     {posargs} \
     --cov-branch \
@@ -25,6 +26,7 @@ skipsdist=True
 setenv=
   SLUGIFY_USES_TEXT_UNIDECODE=yes
 commands =
+  airflow initdb
   pytest \
     {posargs} \
     --cov-branch \