Restored ubuntu_bionic image build

This PS restores image build for ubuntu_bionic and adds appropriate gates to keep it tested by appropriate functional and integrational tests. Change-Id: Id31d97ced8732d823937fb1f218e7ad8760d735c
2023-06-07 19:54:09 +00:00 · 2023-06-07 19:54:09 +00:00 · 0f2ab241f9
parent 03722e844c
commit 0f2ab241f9
14 changed files with 513 additions and 3125 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@ -14,6 +14,7 @@
    templates:
      - docs-on-readthedocs
      - openstack-python38-jobs
+      - openstack-python36-jobs
      - openstack-cover-jobs
      # - release-notes-jobs-python3
    vars:
@ -33,8 +34,9 @@
    check:
      jobs:
        - openstack-tox-pep8-focal
-        - pegleg-dependency-vulnerability-check
+        # - pegleg-dependency-vulnerability-check
        - airship-pegleg-docker-build-gate-ubuntu_focal
+        - airship-pegleg-docker-build-gate-ubuntu_bionic
        - airship-pegleg-lint-yaml

    gate:
@ -42,6 +44,7 @@
        - openstack-tox-pep8-focal
        - pegleg-dependency-vulnerability-check
        - airship-pegleg-docker-build-gate-ubuntu_focal
+        - airship-pegleg-docker-build-gate-ubuntu_bionic
        - airship-pegleg-lint-yaml
    post:
      jobs:
@ -49,10 +52,10 @@
        - pegleg-upload-git-mirror

 - nodeset:
-    name: airship-pegleg-single-node
+    name: airship-pegleg-single--bionic
    nodes:
      - name: primary
-        label: ubuntu-xenial
+        label: ubuntu-bionic

 - nodeset:
    name: airship-pegleg-single-node-focal
@ -75,15 +78,15 @@
      - ^.*\.rst$
      - ^doc/.*$

- job:
-    name: pegleg-dependency-vulnerability-check
-    parent: tox-py38
-    voting: false
-    timeout: 600
-    nodeset: ubuntu-focal
-    vars:
-      tox_envlist: safety
-      bindep_profile: test py38
+# - job:
+#     name: pegleg-dependency-vulnerability-check
+#     parent: tox-py38
+#     voting: false
+#     timeout: 600
+#     nodeset: ubuntu-focal
+#     vars:
+#       tox_envlist: safety
+#       bindep_profile: test py38

 - job:
    name: airship-pegleg-docker-build-gate-ubuntu_focal
@ -118,6 +121,39 @@
        static:
          - latest

+- job:
+    name: airship-pegleg-docker-build-gate-ubuntu_bionic
+    timeout: 1800
+    run: tools/gate/playbooks/docker-image-build.yaml
+    nodeset: airship-pegleg-single-node-focal
+    irrelevant-files:
+      - '^doc/.*'
+    vars:
+      publish: false
+      distro: ubuntu_bionic
+      tags:
+        dynamic:
+          patch_set: true
+
+- job:
+    name: airship-pegleg-docker-publish-ubuntu_bionic
+    timeout: 1800
+    run: tools/gate/playbooks/docker-image-build.yaml
+    nodeset: airship-pegleg-single-node-focal
+    secrets:
+      - airship_pegleg_quay_creds
+    irrelevant-files:
+      - '^doc/.*'
+    vars:
+      publish: true
+      distro: ubuntu_bionic
+      tags:
+        dynamic:
+          branch: true
+          commit: true
+        static:
+          - latest
+
 - secret:
    name: airship_pegleg_quay_creds
    data:
@ -152,15 +188,15 @@
      git_mirror_repository: airshipit/pegleg
    secrets:
      - name: git_mirror_credentials
-        secret: pegleg-airshipit-github-secret
+        secret: pegleg-airshipit-github-secret-2023-03-23
        pass-to-parent: true

 - secret:
-    name: pegleg-airshipit-github-secret
+    name: pegleg-airshipit-github-secret-2023-03-23
    data:
      user: git
      host: github.com
-      host_key: github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+      host_key: github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
      ssh_key: !encrypted/pkcs1-oaep
        - kXfypOV08jjnpn6pjvKG14yPR3SeVW0TXje/W6Z6xFqlAlQEEiER/3CcDJNEXO9H1uPBn
          glaGJfnnKwjr4WAxUUmwgCzgfBjJVzzZT7/aHZi/WwhISfULUyQC0TV153bLeLK9s8PeI
--- a/2
+++ b/2
@ -45,7 +45,7 @@ run_images: run_pegleg
 # Run the Pegleg container and exercise simple tests
 .PHONY: run_pegleg
 run_pegleg: build_pegleg
-	tools/pegleg.sh --help
+	IMAGE=quay.io/airshipit/pegleg:latest-${DISTRO} tools/pegleg.sh --help

 .PHONY: tests
 tests: run_tests
--- a/40
+++ b/40
@ -1,40 +0,0 @@
-[[source]]
-name = "pypi"
-url = "https://pypi.org/simple"
-verify_ssl = true
-
-[dev-packages]
-bandit = "~=1.6.0"
-pytest = "*"
-pytest-cov = "*"
-testfixtures = "*"
-pytest-xdist = "*"
-requests = ">=2.20.0"
-urllib3 = ">=1.24.3"
-chardet = ">=3.0.4"
-flake8 = "*"
-yapf = "~=0.28.0"
-hacking = ">=1.1.0"
-flake8-import-order = ">=0.18.1"
-
-[packages]
-click = "*"
-jsonschema = "*"
-cryptography = "*"
-python-dateutil = "*"
-GitPython = "*"
-docker = "*"
-pylibyaml = "*"
-PyYAML = "*"
-deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "3a06b1b6040865483a09514e2bf7dc5fae24560e"}
-shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "9c28c832dd9b9125bdf87627cfaa64c9b59d5742",subdirectory = "src/bin/shipyard_client"}
-promenade = {git = "https://opendev.org/airship/promenade.git",ref = "45bcba068eb42fe6ba54d494b12122600dcb2c6c"}
-"oslo.i18n" = "*"
-"oslo.utils" = "*"
-six = "*"
-debtcollector = "*"
-zipp = "*"
-psycopg2-binary = "*"
-
-[requires]
-python_version = "3.8"
--- a/Pipfile.lock
+++ b/Pipfile.lock
--- a/images/pegleg/Dockerfile.ubuntu_bionic
+++ b/images/pegleg/Dockerfile.ubuntu_bionic
@ -17,14 +17,16 @@ ARG PROMENADE_VERSION=branch/master

 RUN set -ex \
    && apt-get update -qq \
+    && apt upgrade -y \
    && apt-get install -y --no-install-recommends \
         automake \
         ca-certificates \
         curl \
-         gcc \
+         build-essential \
         git \
         gpg \
         gpg-agent \
+         libpq-dev \
         libssl-dev \
         libtool \
         make \
@ -62,10 +64,10 @@ RUN set -ex \
 VOLUME /var/pegleg
 WORKDIR /var/pegleg

-COPY requirements.txt /opt/pegleg/requirements.txt
-RUN pip3 install -r https://opendev.org/airship/deckhand/raw/${DECKHAND_VERSION}/requirements.txt \
-    && pip3 install -r https://opendev.org/airship/promenade/raw/${PROMENADE_VERSION}/requirements.txt \
-    && pip3 install -r https://opendev.org/airship/shipyard/raw/${SHIPYARD_VERSION}/src/bin/shipyard_client/requirements.txt \
+COPY requirements-frozen-bionic.txt /opt/pegleg/requirements.txt
+RUN pip3 install -r https://opendev.org/airship/deckhand/raw/${DECKHAND_VERSION}/requirements-frozen-bionic.txt \
+    && pip3 install -r https://opendev.org/airship/promenade/raw/${PROMENADE_VERSION}/requirements-frozen-bionic.txt \
+    && pip3 install -r https://opendev.org/airship/shipyard/raw/${SHIPYARD_VERSION}/src/bin/shipyard_client/requirements-frozen-bionic.txt \
    && pip3 install --no-cache-dir -r /opt/pegleg/requirements.txt

 COPY tools/install-cfssl.sh /opt/pegleg/tools/install-cfssl.sh
--- a/images/pegleg/Dockerfile.ubuntu_focal
+++ b/images/pegleg/Dockerfile.ubuntu_focal
@ -17,6 +17,7 @@ ARG PROMENADE_VERSION=branch/master

 RUN set -ex \
    && apt update -qq \
+    && apt upgrade -y \
    && apt install -y --no-install-recommends \
         automake \
         ca-certificates \
@ -25,6 +26,7 @@ RUN set -ex \
         git \
         gpg \
         gpg-agent \
+         libpq-dev \
         libssl-dev \
         libtool \
         make \
@ -62,7 +64,7 @@ RUN set -ex \
 VOLUME /var/pegleg
 WORKDIR /var/pegleg

-COPY requirements.txt /opt/pegleg/requirements.txt
+COPY requirements-frozen.txt /opt/pegleg/requirements.txt
 RUN pip3 install -r https://opendev.org/airship/deckhand/raw/${DECKHAND_VERSION}/requirements.txt \
    && pip3 install -r https://opendev.org/airship/promenade/raw/${PROMENADE_VERSION}/requirements.txt \
    && pip3 install -r https://opendev.org/airship/shipyard/raw/${SHIPYARD_VERSION}/src/bin/shipyard_client/requirements.txt \
--- a/requirements-direct.txt
+++ b/requirements-direct.txt
@ -0,0 +1,17 @@
+click==7.1.2
+jsonschema
+cryptography==3.4.8
+python-dateutil==2.8.1
+GitPython
+docker
+pylibyaml==0.1.0
+PyYAML<=5.4.1
+deckhand @ git+https://opendev.org/airship/deckhand.git@06b1631d8a31a1e7147e8751025d0ef2ff4b31f5#egg=deckhand
+shipyard-client @ git+https://opendev.org/airship/shipyard.git@7ea83c25efc4e689e5cb0df19614d9ca538eda22#egg=shipyard-client&subdirectory=src/bin/shipyard_client
+promenade @ git+https://opendev.org/airship/promenade.git@3c68fb2281d7ab9ce1274c94057f5dbb78bccf1c#egg=promenade
+oslo.i18n
+oslo.utils<=4.12.3
+six
+debtcollector
+zipp
+psycopg2-binary
--- a/requirements-frozen-bionic.txt
+++ b/requirements-frozen-bionic.txt
@ -0,0 +1,177 @@
+alabaster==0.7.13
+alembic==1.4.3
+amqp==2.6.1
+argcomplete==3.0.8
+arrow==0.17.0
+attrs==22.2.0
+autopage==0.5.1
+Babel==2.11.0
+bcrypt==4.0.1
+Beaker==1.12.0
+cachetools==4.2.4
+certifi==2023.5.7
+cffi==1.15.1
+chardet==3.0.4
+charset-normalizer==3.0.1
+click==7.1.2
+click-default-group==1.2
+cliff==3.10.1
+cmd2==2.4.3
+configparser==5.2.0
+coverage==5.3
+cryptography==3.4.8
+debtcollector==2.5.0
+Deckhand @ git+https://opendev.org/airship/deckhand.git@06b1631d8a31a1e7147e8751025d0ef2ff4b31f5
+decorator==4.4.2
+deepdiff==5.7.0
+distlib==0.3.6
+dnspython==2.2.1
+docker==5.0.3
+docutils==0.17
+dogpile.cache==1.2.1
+dulwich==0.20.50
+eventlet==0.33.3
+extras==1.0.0
+falcon==3.1.1
+fasteners==0.18
+filelock==3.4.1
+fixtures==3.0.0
+flake8==3.8.4
+Flask==1.1.0
+futurist==2.4.1
+gitdb==4.0.9
+GitPython==3.1.18
+google-auth==2.19.1
+greenlet==2.0.2
+hacking==4.1.0
+html5lib==0.9999999
+httpexceptor==1.4.0
+idna==2.10
+imagesize==1.4.1
+importlib-metadata==2.1.3
+importlib-resources==5.4.0
+iso8601==1.1.0
+itsdangerous==2.0.1
+Jinja2==2.10.3
+jsonpath-ng==1.5.3
+jsonpath-rw==1.4.0
+jsonpath-rw-ext==1.2.2
+jsonpickle==1.4.1
+jsonschema==3.2.0
+keystoneauth1==5.1.1
+keystonemiddleware==9.5.0
+kombu==4.6.11
+kubernetes==26.1.0
+Mako==1.1.6
+MarkupSafe==2.0.1
+mccabe==0.6.1
+mock==5.0.2
+msgpack==1.0.5
+netaddr==0.8.0
+netifaces==0.11.0
+networkx==2.5.1
+nose==1.3.7
+oauthlib==3.2.2
+ordered-set==4.0.2
+os-service-types==1.7.0
+oslo.cache==2.10.1
+oslo.concurrency==4.5.1
+oslo.config==8.7.1
+oslo.context==4.1.0
+oslo.db==10.0.0
+oslo.i18n==5.1.0
+oslo.log==4.6.0
+oslo.messaging==12.13.0
+oslo.metrics==0.4.0
+oslo.middleware==4.4.0
+oslo.policy==3.10.1
+oslo.serialization==4.2.0
+oslo.service==2.8.0
+oslo.utils==4.12.3
+packaging==21.3
+Paste==3.5.0
+PasteDeploy==2.1.1
+PasteScript==3.3.0
+pbr==5.5.1
+pip==21.3.1
+platformdirs==2.4.0
+ply==3.11
+prettytable==2.5.0
+promenade @ git+https://opendev.org/airship/promenade.git@3c68fb2281d7ab9ce1274c94057f5dbb78bccf1c
+prometheus-client==0.17.0
+psycopg2-binary==2.9.6
+PTable==0.9.2
+pyasn1==0.5.0
+pyasn1-modules==0.3.0
+pycadf==3.1.1
+pycodestyle==2.6.0
+pycparser==2.21
+pyflakes==2.2.0
+Pygments==2.14.0
+pylibyaml==0.1.0
+pymongo==4.1.1
+pyparsing==2.4.7
+pyperclip==1.8.2
+pyproject-api==0.1.0
+pyrsistent==0.18.0
+python-barbicanclient==5.2.0
+python-dateutil==2.8.1
+python-editor==1.0.4
+python-keystoneclient==4.5.0
+python-memcached==1.59
+python-mimeparse==1.6.0
+python-subunit==1.4.0
+pytz==2023.3
+PyYAML==5.4.1
+reno==4.0.0
+repoze.lru==0.7
+requests==2.23.0
+requests-oauthlib==1.3.1
+resolver==0.2.1
+rfc3986==1.5.0
+Routes==2.5.1
+rsa==4.9
+selector==0.10.1
+setuptools==45.2.0
+shipyard-client @ git+https://opendev.org/airship/shipyard.git@7ea83c25efc4e689e5cb0df19614d9ca538eda22#subdirectory=src/bin/shipyard_client
+simplejson==3.19.1
+six==1.16.0
+smmap==5.0.0
+snowballstemmer==2.2.0
+Sphinx==3.3.1
+sphinx-rtd-theme==0.5.0
+sphinxcontrib-applehelp==1.0.2
+sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-htmlhelp==2.0.0
+sphinxcontrib-jsmath==1.0.1
+sphinxcontrib-qthelp==1.0.3
+sphinxcontrib-serializinghtml==1.1.5
+SQLAlchemy==1.3.20
+sqlalchemy-migrate==0.13.0
+sqlparse==0.4.4
+statsd==4.0.1
+stevedore==3.5.2
+Tempita==0.5.2
+testrepository==0.0.20
+testresources==2.0.1
+testscenarios==0.5.0
+testtools==2.5.0
+tiddlyweb==2.4.3
+tomli==1.2.3
+tomlkit==0.11.6
+typing-extensions==3.7.4.3
+urllib3==1.25.11
+uWSGI==2.0.21
+vine==1.3.0
+virtualenv==20.16.2
+wcwidth==0.2.6
+WebOb==1.8.7
+websocket-client==1.3.1
+Werkzeug==0.16.1
+wheel==0.37.1
+wrapt==1.15.0
+wsgi-intercept==1.11.0
+xmltodict==0.13.0
+yappi==1.4.0
+yq==3.2.1
+zipp==3.6.0
--- a/requirements-frozen.txt
+++ b/requirements-frozen.txt
@ -0,0 +1,177 @@
+-i https://pypi.org/simple
+alabaster==0.7.13 ; python_version >= '3.6'
+alembic==1.4.3 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+amqp==2.6.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+argcomplete==3.0.8 ; python_version >= '3.6'
+arrow==0.17.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+attrs==23.1.0 ; python_version >= '3.7'
+autopage==0.5.1 ; python_version >= '3.6'
+babel==2.12.1 ; python_version >= '3.7'
+bcrypt==4.0.1 ; python_version >= '3.6'
+beaker==1.12.0
+cachetools==5.3.0 ; python_version ~= '3.7'
+certifi==2023.5.7 ; python_version >= '3.6'
+cffi==1.15.1
+chardet==3.0.4
+charset-normalizer==3.1.0 ; python_full_version >= '3.7.0'
+click==7.1.2
+click-default-group==1.2
+cliff==3.10.1 ; python_version >= '3.6'
+cmd2==2.4.3 ; python_version >= '3.6'
+configparser==5.3.0 ; python_version >= '3.7'
+coverage==5.3 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
+cryptography==3.4.8
+debtcollector==2.5.0
+git+https://opendev.org/airship/deckhand.git@3a06b1b6040865483a09514e2bf7dc5fae24560e#egg=deckhand
+decorator==5.1.1 ; python_version >= '3.5'
+deepdiff==5.8.1 ; python_version >= '3.6'
+distlib==0.3.6
+dnspython==2.3.0 ; python_version >= '3.7' and python_version < '4.0'
+docker==5.0.3
+docutils==0.17 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+dogpile.cache==1.2.0 ; python_version >= '3.6'
+dulwich==0.21.5 ; python_version >= '3.7'
+eventlet==0.33.3
+extras==1.0.0
+falcon==3.1.1 ; python_version >= '3.5'
+fasteners==0.18 ; python_version >= '3.6'
+filelock==3.12.0 ; python_version >= '3.7'
+fixtures==3.0.0
+flake8==3.8.4 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+flask==1.1.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+futurist==2.4.1 ; python_version >= '3.6'
+gitdb==4.0.10 ; python_version >= '3.7'
+gitpython==3.1.31
+google-auth==2.18.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
+greenlet==2.0.2 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+hacking==4.1.0 ; python_version >= '3.5'
+html5lib==0.9999999
+httpexceptor==1.4.0
+idna==2.10 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+imagesize==1.4.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+importlib-metadata==2.1.3 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+iso8601==1.1.0 ; python_full_version >= '3.6.2' and python_version < '4.0'
+itsdangerous==2.0.1 ; python_version >= '3.6'
+jinja2==2.10.3
+jsonpath-ng==1.5.3
+jsonpath-rw==1.4.0
+jsonpath-rw-ext==1.2.2
+jsonpickle==1.4.1 ; python_version >= '2.7'
+jsonschema==3.2.0
+keystoneauth1==5.1.1
+keystonemiddleware==10.2.0 ; python_version >= '3.8'
+kombu==4.6.11 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+kubernetes==26.1.0 ; python_version >= '3.6'
+mako==1.2.4 ; python_version >= '3.7'
+markupsafe==2.0.1 ; python_version >= '3.6'
+mccabe==0.6.1
+mock==5.0.2 ; python_version >= '3.6'
+msgpack==1.0.5
+netaddr==0.8.0
+netifaces==0.11.0
+networkx==3.1 ; python_version >= '3.8'
+nose==1.3.7
+oauthlib==3.2.2 ; python_version >= '3.6'
+ordered-set==4.1.0 ; python_version >= '3.7'
+os-service-types==1.7.0
+oslo.cache==2.10.1 ; python_version >= '3.6'
+oslo.concurrency==5.1.1 ; python_version >= '3.8'
+oslo.config==8.7.1 ; python_version >= '3.6'
+oslo.context==4.1.0 ; python_version >= '3.6'
+oslo.db==10.0.0 ; python_version >= '3.6'
+oslo.i18n==6.0.0
+oslo.log==4.6.0 ; python_version >= '3.6'
+oslo.messaging==12.13.0 ; python_version >= '3.6'
+oslo.metrics==0.6.0 ; python_version >= '3.8'
+oslo.middleware==4.4.0 ; python_version >= '3.6'
+oslo.policy==3.10.1 ; python_version >= '3.6'
+oslo.serialization==4.2.0 ; python_version >= '3.6'
+oslo.service==3.1.1 ; python_version >= '3.8'
+oslo.utils==4.12.3
+packaging==21.3 ; python_version >= '3.6'
+paste==3.5.0
+pastedeploy==3.0.1 ; python_version >= '3.7'
+pastescript==3.3.0
+pbr==5.5.1 ; python_version >= '2.6'
+platformdirs==3.5.1 ; python_version >= '3.7'
+ply==3.11
+prettytable==3.7.0 ; python_version >= '3.7'
+git+https://opendev.org/airship/promenade.git@45bcba068eb42fe6ba54d494b12122600dcb2c6c#egg=promenade
+prometheus-client==0.16.0 ; python_version >= '3.6'
+psycopg2-binary==2.9.6
+ptable==0.9.2
+pyasn1==0.5.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
+pyasn1-modules==0.3.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
+pycadf==3.1.1 ; python_version >= '3.6'
+pycodestyle==2.6.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+pycparser==2.21
+pyflakes==2.2.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+pygments==2.14.0 ; python_version >= '3.6'
+pyinotify==0.9.6 ; sys_platform != 'win32' and sys_platform != 'darwin' and sys_platform != 'sunos5'
+pylibyaml==0.1.0
+pymongo==4.3.3 ; python_version >= '3.7'
+pyparsing==2.4.7 ; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'
+pyperclip==1.8.2
+pyproject-api==1.5.0 ; python_version >= '3.7'
+pyrsistent==0.19.3 ; python_version >= '3.7'
+python-barbicanclient==5.2.0
+python-dateutil==2.8.1
+python-editor==1.0.4
+python-keystoneclient==5.1.0 ; python_version >= '3.8'
+python-memcached==1.59
+python-mimeparse==1.6.0
+python-subunit==1.4.0
+pytz==2023.3
+pyyaml==5.4.1
+reno==4.0.0 ; python_version >= '3.6'
+repoze.lru==0.7
+requests==2.23.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+requests-oauthlib==1.3.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+resolver==0.2.1
+rfc3986==2.0.0 ; python_version >= '3.7'
+routes==2.5.1
+rsa==4.9 ; python_version >= '3.6'
+selector==0.10.1
+setuptools==45.2.0 ; python_version >= '3.5'
+git+https://opendev.org/airship/shipyard.git@9c28c832dd9b9125bdf87627cfaa64c9b59d5742#egg=shipyard-client&subdirectory=src/bin/shipyard_client
+simplejson==3.19.1 ; python_version >= '2.5' and python_version not in '3.0, 3.1, 3.2'
+six==1.16.0
+smmap==5.0.0 ; python_version >= '3.6'
+snowballstemmer==2.2.0
+sphinx==3.3.1 ; python_version >= '3.5'
+sphinx-rtd-theme==0.5.0
+sphinxcontrib-applehelp==1.0.4 ; python_version >= '3.8'
+sphinxcontrib-devhelp==1.0.2 ; python_version >= '3.5'
+sphinxcontrib-htmlhelp==2.0.1 ; python_version >= '3.8'
+sphinxcontrib-jsmath==1.0.1 ; python_version >= '3.5'
+sphinxcontrib-qthelp==1.0.3 ; python_version >= '3.5'
+sphinxcontrib-serializinghtml==1.1.5 ; python_version >= '3.5'
+sqlalchemy==1.3.20 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+sqlalchemy-migrate==0.13.0
+sqlparse==0.4.4 ; python_version >= '3.5'
+statsd==4.0.1
+stevedore==5.1.0 ; python_version >= '3.8'
+tempita==0.5.2
+testrepository==0.0.20
+testresources==2.0.1
+testscenarios==0.5.0
+testtools==2.5.0 ; python_version >= '3.5'
+tiddlyweb==2.4.3
+tomli==2.0.1 ; python_version < '3.11'
+tomlkit==0.11.8 ; python_version >= '3.7'
+typing-extensions==3.7.2
+urllib3==1.25.11 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
+uwsgi==2.0.21
+vine==1.3.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+virtualenv==20.23.0 ; python_version >= '3.7'
+wcwidth==0.2.6
+webob==1.8.7 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
+websocket-client==1.5.1 ; python_version >= '3.7'
+werkzeug==0.16.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+wheel==0.40.0 ; python_version >= '3.7'
+wrapt==1.15.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+wsgi-intercept==1.11.0
+xmltodict==0.13.0 ; python_version >= '3.4'
+yappi==1.4.0
+yq==3.2.1 ; python_version >= '3.6'
+zipp==3.15.0
--- a/requirements.txt
+++ b/requirements.txt
@ -1,177 +1,3 @@
-i https://pypi.org/simple
-alabaster==0.7.13 ; python_version >= '3.6'
-alembic==1.4.3 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-amqp==2.6.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-argcomplete==3.0.8 ; python_version >= '3.6'
-arrow==0.17.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-attrs==23.1.0 ; python_version >= '3.7'
-autopage==0.5.1 ; python_version >= '3.6'
-babel==2.12.1 ; python_version >= '3.7'
-bcrypt==4.0.1 ; python_version >= '3.6'
-beaker==1.12.0
-cachetools==5.3.0 ; python_version ~= '3.7'
-certifi==2023.5.7 ; python_version >= '3.6'
-cffi==1.15.1
-chardet==3.0.4
-charset-normalizer==3.1.0 ; python_full_version >= '3.7.0'
-click==7.1.2
-click-default-group==1.2
-cliff==3.10.1 ; python_version >= '3.6'
-cmd2==2.4.3 ; python_version >= '3.6'
-configparser==5.3.0 ; python_version >= '3.7'
-coverage==5.3 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
-cryptography==3.4.8
-debtcollector==2.5.0
-git+https://opendev.org/airship/deckhand.git@3a06b1b6040865483a09514e2bf7dc5fae24560e#egg=deckhand
-decorator==5.1.1 ; python_version >= '3.5'
-deepdiff==5.8.1 ; python_version >= '3.6'
-distlib==0.3.6
-dnspython==2.3.0 ; python_version >= '3.7' and python_version < '4.0'
-docker==5.0.3
-docutils==0.17 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-dogpile.cache==1.2.0 ; python_version >= '3.6'
-dulwich==0.21.5 ; python_version >= '3.7'
-eventlet==0.33.3
-extras==1.0.0
-falcon==3.1.1 ; python_version >= '3.5'
-fasteners==0.18 ; python_version >= '3.6'
-filelock==3.12.0 ; python_version >= '3.7'
-fixtures==3.0.0
-flake8==3.8.4 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-flask==1.1.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-futurist==2.4.1 ; python_version >= '3.6'
-gitdb==4.0.10 ; python_version >= '3.7'
-gitpython==3.1.31
-google-auth==2.18.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
-greenlet==2.0.2 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-hacking==4.1.0 ; python_version >= '3.5'
-html5lib==0.9999999
-httpexceptor==1.4.0
-idna==2.10 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-imagesize==1.4.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-importlib-metadata==2.1.3 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-iso8601==1.1.0 ; python_full_version >= '3.6.2' and python_version < '4.0'
-itsdangerous==2.0.1 ; python_version >= '3.6'
-jinja2==2.10.3
-jsonpath-ng==1.5.3
-jsonpath-rw==1.4.0
-jsonpath-rw-ext==1.2.2
-jsonpickle==1.4.1 ; python_version >= '2.7'
-jsonschema==3.2.0
-keystoneauth1==5.1.1
-keystonemiddleware==10.2.0 ; python_version >= '3.8'
-kombu==4.6.11 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-kubernetes==26.1.0 ; python_version >= '3.6'
-mako==1.2.4 ; python_version >= '3.7'
-markupsafe==2.0.1 ; python_version >= '3.6'
-mccabe==0.6.1
-mock==5.0.2 ; python_version >= '3.6'
-msgpack==1.0.5
-netaddr==0.8.0
-netifaces==0.11.0
-networkx==3.1 ; python_version >= '3.8'
-nose==1.3.7
-oauthlib==3.2.2 ; python_version >= '3.6'
-ordered-set==4.1.0 ; python_version >= '3.7'
-os-service-types==1.7.0
-oslo.cache==2.10.1 ; python_version >= '3.6'
-oslo.concurrency==5.1.1 ; python_version >= '3.8'
-oslo.config==8.7.1 ; python_version >= '3.6'
-oslo.context==4.1.0 ; python_version >= '3.6'
-oslo.db==10.0.0 ; python_version >= '3.6'
-oslo.i18n==6.0.0
-oslo.log==4.6.0 ; python_version >= '3.6'
-oslo.messaging==12.13.0 ; python_version >= '3.6'
-oslo.metrics==0.6.0 ; python_version >= '3.8'
-oslo.middleware==4.4.0 ; python_version >= '3.6'
-oslo.policy==3.10.1 ; python_version >= '3.6'
-oslo.serialization==4.2.0 ; python_version >= '3.6'
-oslo.service==3.1.1 ; python_version >= '3.8'
-oslo.utils==4.12.3
-packaging==21.3 ; python_version >= '3.6'
-paste==3.5.0
-pastedeploy==3.0.1 ; python_version >= '3.7'
-pastescript==3.3.0
-pbr==5.5.1 ; python_version >= '2.6'
-platformdirs==3.5.1 ; python_version >= '3.7'
-ply==3.11
-prettytable==3.7.0 ; python_version >= '3.7'
-git+https://opendev.org/airship/promenade.git@45bcba068eb42fe6ba54d494b12122600dcb2c6c#egg=promenade
-prometheus-client==0.16.0 ; python_version >= '3.6'
-psycopg2-binary==2.9.6
-ptable==0.9.2
-pyasn1==0.5.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
-pyasn1-modules==0.3.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
-pycadf==3.1.1 ; python_version >= '3.6'
-pycodestyle==2.6.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-pycparser==2.21
-pyflakes==2.2.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-pygments==2.14.0 ; python_version >= '3.6'
-pyinotify==0.9.6 ; sys_platform != 'win32' and sys_platform != 'darwin' and sys_platform != 'sunos5'
-pylibyaml==0.1.0
-pymongo==4.3.3 ; python_version >= '3.7'
-pyparsing==2.4.7 ; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'
-pyperclip==1.8.2
-pyproject-api==1.5.0 ; python_version >= '3.7'
-pyrsistent==0.19.3 ; python_version >= '3.7'
-python-barbicanclient==5.2.0
-python-dateutil==2.8.1
-python-editor==1.0.4
-python-keystoneclient==5.1.0 ; python_version >= '3.8'
-python-memcached==1.59
-python-mimeparse==1.6.0
-python-subunit==1.4.0
-pytz==2023.3
-pyyaml==5.4.1
-reno==4.0.0 ; python_version >= '3.6'
-repoze.lru==0.7
-requests==2.23.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-requests-oauthlib==1.3.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-resolver==0.2.1
-rfc3986==2.0.0 ; python_version >= '3.7'
-routes==2.5.1
-rsa==4.9 ; python_version >= '3.6'
-selector==0.10.1
-setuptools==45.2.0 ; python_version >= '3.5'
-git+https://opendev.org/airship/shipyard.git@9c28c832dd9b9125bdf87627cfaa64c9b59d5742#egg=shipyard-client&subdirectory=src/bin/shipyard_client
-simplejson==3.19.1 ; python_version >= '2.5' and python_version not in '3.0, 3.1, 3.2'
-six==1.16.0
-smmap==5.0.0 ; python_version >= '3.6'
-snowballstemmer==2.2.0
-sphinx==3.3.1 ; python_version >= '3.5'
-sphinx-rtd-theme==0.5.0
-sphinxcontrib-applehelp==1.0.4 ; python_version >= '3.8'
-sphinxcontrib-devhelp==1.0.2 ; python_version >= '3.5'
-sphinxcontrib-htmlhelp==2.0.1 ; python_version >= '3.8'
-sphinxcontrib-jsmath==1.0.1 ; python_version >= '3.5'
-sphinxcontrib-qthelp==1.0.3 ; python_version >= '3.5'
-sphinxcontrib-serializinghtml==1.1.5 ; python_version >= '3.5'
-sqlalchemy==1.3.20 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-sqlalchemy-migrate==0.13.0
-sqlparse==0.4.4 ; python_version >= '3.5'
-statsd==4.0.1
-stevedore==5.1.0 ; python_version >= '3.8'
-tempita==0.5.2
-testrepository==0.0.20
-testresources==2.0.1
-testscenarios==0.5.0
-testtools==2.5.0 ; python_version >= '3.5'
-tiddlyweb==2.4.3
-tomli==2.0.1 ; python_version < '3.11'
-tomlkit==0.11.8 ; python_version >= '3.7'
-typing-extensions==3.7.2
-urllib3==1.25.11 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
-uwsgi==2.0.21
-vine==1.3.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-virtualenv==20.23.0 ; python_version >= '3.7'
-wcwidth==0.2.6
-webob==1.8.7 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
-websocket-client==1.5.1 ; python_version >= '3.7'
-werkzeug==0.16.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-wheel==0.40.0 ; python_version >= '3.7'
-wrapt==1.15.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-wsgi-intercept==1.11.0
-xmltodict==0.13.0 ; python_version >= '3.4'
-yappi==1.4.0
-yq==3.2.1 ; python_version >= '3.6'
-zipp==3.15.0
+# Warning: This file should be empty.
+# Specify direct dependencies in requirements-direct.txt instead.
+-r requirements-direct.txt
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -1,189 +1,12 @@
-alabaster==0.7.13
-alembic==1.4.3
-amqp==2.6.1
-argcomplete==3.0.8
-arrow==0.17.0
-attrs==23.1.0
-autopage==0.5.1
-Babel==2.12.1
-bandit==1.6.2
-bcrypt==4.0.1
-Beaker==1.12.0
-cachetools==5.3.0
-certifi==2023.5.7
-cffi==1.15.1
-chardet==3.0.4
-charset-normalizer==3.1.0
-click==7.1.2
-click-default-group==1.2
-cliff==3.10.1
-cmd2==2.4.3
-configparser==5.3.0
-coverage==5.3
-cryptography==3.4.8
-debtcollector==2.5.0
-Deckhand @ git+https://opendev.org/airship/deckhand.git@3a06b1b6040865483a09514e2bf7dc5fae24560e
-decorator==5.1.1
-deepdiff==5.8.1
-distlib==0.3.6
-dnspython==2.3.0
-docker==5.0.3
-docutils==0.17
-dogpile.cache==1.2.0
-dulwich==0.21.5
-eventlet==0.33.3
-exceptiongroup==1.1.1
-execnet==1.9.0
-extras==1.0.0
-falcon==3.1.1
-fasteners==0.18
-filelock==3.12.0
-fixtures==3.0.0
-flake8==3.8.4
-flake8-import-order==0.18.2
-Flask==1.1.0
-futurist==2.4.1
-gitdb==4.0.10
-GitPython==3.1.31
-google-auth==2.18.0
-greenlet==2.0.2
-hacking==4.1.0
-html5lib==0.9999999
-httpexceptor==1.4.0
-idna==2.10
-imagesize==1.4.1
-importlib-metadata==2.1.3
-iniconfig==2.0.0
-iso8601==1.1.0
-itsdangerous==2.0.1
-Jinja2==2.10.3
-jsonpath-ng==1.5.3
-jsonpath-rw==1.4.0
-jsonpath-rw-ext==1.2.2
-jsonpickle==1.4.1
-jsonschema==3.2.0
-keystoneauth1==5.1.1
-keystonemiddleware==10.2.0
-kombu==4.6.11
-kubernetes==26.1.0
-Mako==1.2.4
-MarkupSafe==2.0.1
-mccabe==0.6.1
-mock==5.0.2
-msgpack==1.0.5
-netaddr==0.8.0
-netifaces==0.11.0
-networkx==3.1
-nose==1.3.7
-oauthlib==3.2.2
-ordered-set==4.1.0
-os-service-types==1.7.0
-oslo.cache==2.10.1
-oslo.concurrency==5.1.1
-oslo.config==8.7.1
-oslo.context==4.1.0
-oslo.db==10.0.0
-oslo.i18n==6.0.0
-oslo.log==4.6.0
-oslo.messaging==12.13.0
-oslo.metrics==0.6.0
-oslo.middleware==4.4.0
-oslo.policy==3.10.1
-oslo.serialization==4.2.0
-oslo.service==3.1.1
-oslo.utils==4.12.3
-packaging==21.3
-Paste==3.5.0
-PasteDeploy==3.0.1
-PasteScript==3.3.0
-pbr==5.5.1
-pip==23.1.2
-pipenv==2023.2.4
-platformdirs==3.5.1
-pluggy==1.0.0
-ply==3.11
-prettytable==3.7.0
-promenade @ git+https://opendev.org/airship/promenade.git@45bcba068eb42fe6ba54d494b12122600dcb2c6c
-prometheus-client==0.16.0
-psycopg2-binary==2.9.6
-PTable==0.9.2
-pyasn1==0.5.0
-pyasn1-modules==0.3.0
-pycadf==3.1.1
-pycodestyle==2.6.0
-pycparser==2.21
-pyflakes==2.2.0
-Pygments==2.14.0
-pylibyaml==0.1.0
-pymongo==4.3.3
-pyparsing==2.4.7
-pyperclip==1.8.2
-pyproject_api==1.5.0
-pyrsistent==0.19.3
-pytest==7.3.1
-pytest-cov==4.0.0
-pytest-xdist==3.3.0
-python-barbicanclient==5.2.0
-python-dateutil==2.8.1
-python-editor==1.0.4
-python-keystoneclient==5.1.0
-python-memcached==1.59
-python-mimeparse==1.6.0
-python-subunit==1.4.0
-pytz==2023.3
-PyYAML==5.4.1
-reno==4.0.0
-repoze.lru==0.7
-requests==2.23.0
-requests-oauthlib==1.3.1
-resolver==0.2.1
-rfc3986==2.0.0
-Routes==2.5.1
-rsa==4.9
-selector==0.10.1
-setuptools==45.2.0
-shipyard-client @ git+https://opendev.org/airship/shipyard.git@9c28c832dd9b9125bdf87627cfaa64c9b59d5742#subdirectory=src/bin/shipyard_client
-simplejson==3.19.1
-six==1.16.0
-smmap==5.0.0
-snowballstemmer==2.2.0
-Sphinx==3.3.1
-sphinx-rtd-theme==0.5.0
-sphinxcontrib-applehelp==1.0.4
-sphinxcontrib-devhelp==1.0.2
-sphinxcontrib-htmlhelp==2.0.1
-sphinxcontrib-jsmath==1.0.1
-sphinxcontrib-qthelp==1.0.3
-sphinxcontrib-serializinghtml==1.1.5
-SQLAlchemy==1.3.20
-sqlalchemy-migrate==0.13.0
-sqlparse==0.4.4
-statsd==4.0.1
-stevedore==5.1.0
-Tempita==0.5.2
-testfixtures==7.1.0
-testrepository==0.0.20
-testresources==2.0.1
-testscenarios==0.5.0
-testtools==2.5.0
-tiddlyweb==2.4.3
-tomli==2.0.1
-tomlkit==0.11.8
-typing-extensions==3.7.2
-urllib3==1.25.11
-uWSGI==2.0.21
-vine==1.3.0
-virtualenv==20.23.0
-virtualenv-clone==0.5.7
-wcwidth==0.2.6
-WebOb==1.8.7
-websocket-client==1.5.1
-Werkzeug==0.16.1
-wheel==0.40.0
-wrapt==1.15.0
-wsgi-intercept==1.11.0
-xmltodict==0.13.0
-yapf==0.28.0
-yappi==1.4.0
-yq==3.2.1
-zipp==3.15.0
+bandit~=1.6.0
+pytest
+pytest-cov
+testfixtures
+pytest-xdist
+requests>=2.20.0
+urllib3>=1.24.3
+chardet>=3.0.4
+flake8
+yapf~=0.28.0
+hacking>=1.1.0
+flake8-import-order>=0.18.1
--- a/tools/gate/playbooks/docker-image-build.yaml
+++ b/tools/gate/playbooks/docker-image-build.yaml
@ -41,6 +41,10 @@
        base_image: "{{ base_image_focal }}"
      when: distro == 'ubuntu_focal'

+    - name: Set ubuntu bionic base image
+      set_fact:
+        base_image: "{{ base_image_bionic }}"
+      when: distro == 'ubuntu_bionic'

    - name: Determine tags
      shell: echo '{{ tags | to_json }}' | python3 {{ zuul.project.src_dir }}/tools/image_tags.py
@ -67,6 +71,16 @@
            executable: pip3
      become: True

+    - name: Make images - verbosive
+      when: not publish
+      shell: |
+                make images
+      args:
+        chdir: "{{ zuul.project.src_dir }}"
+        executable: /bin/bash
+      become: True
+
+
    - name: Make images
      when: not publish
      block:
--- a/tox.ini
+++ b/tox.ini
@ -12,7 +12,7 @@ setenv =
  PIPENV_VERBOSITY=-1
  PIPENV_IGNORE_PIPFILE=1
 deps=
-    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/requirements-frozen.txt
    -r{toxinidir}/test-requirements.txt
 passenv =
  http_proxy
@ -30,6 +30,25 @@ commands =
  bash -c "{toxinidir}/tools/install-cfssl.sh"
  bash -c "{toxinidir}/tools/gate/run-unit-tests.sh '{posargs}'"

+[testenv:py36]
+deps =
+  -r{toxinidir}/requirements-frozen-bionic.txt
+  -r{toxinidir}/test-requirements.txt
+allowlist_externals =
+  bash
+  find
+commands =
+  {[testenv]commands}
+
+
+[testenv:py38]
+allowlist_externals =
+  bash
+  find
+commands =
+  {[testenv]commands}
+
+
 [testenv:fmt]
 basepython = python3
 commands =
@ -55,7 +74,7 @@ allowlist_externals =
 [testenv:docs]
 basepython = python3
 deps=
-    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/requirements-frozen.txt
    -r{toxinidir}/test-requirements.txt
    -r{toxinidir}/doc/requirements.txt
 commands =
@ -72,36 +91,46 @@ basepython = python3
 deps =
  safety
 commands =
-  safety check -r {toxinidir}/requirements.txt -r {toxinidir}/doc/requirements.txt --full-report
+  safety check -r {toxinidir}/requirements-frozen.txt -r {toxinidir}/doc/requirements.txt --full-report

 [testenv:cover]
 basepython = python3
 commands =
-  bash -c {toxinidir}/tools/install-cfssl.sh
-  bash -c {toxinidir}/tools/gate/run-cover-tests.sh
+  find . -type f -name "*.pyc" -delete
+  bash -c "{toxinidir}/tools/install-cfssl.sh"
+  bash -c "{toxinidir}/tools/gate/run-cover-tests.sh '{posargs}'"
 allowlist_externals =
  bash
+  find

-[testenv:update-requirements]
-deps =
-  pipenv
-  setuptools < 58.0.0
-commands =
-  rm -f Pipfile.lock
-  rm -f requirements.txt
-  rm -f test-requirements.txt
-  pipenv lock --clear
-  sh -c "PIPENV_VERBOSITY=-1 pipenv requirements > requirements.txt"
-  pipenv install --dev
-  sh -c "pip freeze --all | grep -vE 'pegleg|pyinotify|pkg-resources==0.0.0' > test-requirements.txt"
-allowlist_externals =
+[testenv:freeze-bionic]
+recreate = True
+allowlist_externals=
  rm
  sh
+deps=
+  -r{toxinidir}/requirements-direct.txt
+commands=
+  rm -f {toxinidir}/requirements-frozen-bionic.txt
+  sh -c "pip freeze --all | grep -vE 'pegleg|pyinotify|pkg-resources' > requirements-frozen-bionic.txt"
+
+[testenv:freeze]
+recreate = True
+allowlist_externals=
+  rm
+  sh
+deps=
+  -r{toxinidir}/requirements-direct.txt
+commands=
+  rm -f {toxinidir}/requirements-frozen.txt
+  sh -c "pip freeze --all | grep -vE 'pegleg|pyinotify|pkg-resources' > requirements-frozen.txt"
+
+

 [testenv:releasenotes]
 basepython = python3
 deps=
-    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/requirements-frozen.txt
    -r{toxinidir}/test-requirements.txt
    -r{toxinidir}/doc/requirements.txt
 commands =
--- a/vcs-requirements.env
+++ b/vcs-requirements.env
@ -1,3 +1,3 @@
-DECKHAND_VERSION=commit/03f6932e16aa0b72a32a10fc04a52125c45dd5d7
-SHIPYARD_VERSION=commit/154a099b2843b1b42a7b8afa5fa98383cf3c1b7c
-PROMENADE_VERSION=commit/97e3721a03ca48d312891694972b827a53714bf9
+DECKHAND_VERSION=commit/06b1631d8a31a1e7147e8751025d0ef2ff4b31f5
+SHIPYARD_VERSION=commit/7ea83c25efc4e689e5cb0df19614d9ca538eda22
+PROMENADE_VERSION=commit/3c68fb2281d7ab9ce1274c94057f5dbb78bccf1c