From 7f5f0bd4df8646877f7e3a5b7b281724e66d07c8 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 9 Dec 2021 15:25:47 -0800
Subject: [PATCH] Update refstack image to bullseye

Some spring cleaning now that bullseye is available. While we are at it
we fix up the job requires and provides for the related image building
and service testing jobs too.

Change-Id: I8a392e06df66b2e0c85157e61e529bb649d8ad58
---
 docker/refstack/Dockerfile         | 8 ++++----
 zuul.d/docker-images/refstack.yaml | 7 +++++++
 zuul.d/system-config-run.yaml      | 3 ++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/docker/refstack/Dockerfile b/docker/refstack/Dockerfile
index dce7555b8a..ef8c495aed 100644
--- a/docker/refstack/Dockerfile
+++ b/docker/refstack/Dockerfile
@@ -16,14 +16,14 @@
 # upload trigger - Mon 26 Oct 2021 06:00 PM UTC
 # refstack commit - bb0e985734690394e227d16af893b8e4ac8d3724
 
-FROM opendevorg/python-builder as builder
+FROM opendevorg/python-builder:3.8-bullseye as builder
 
 RUN apt-get update \
   && apt-get -y install git apt-utils python3-dev dh-python libc-dev-bin \
      libc6-dev libexpat1-dev libpython3-dev libpython3-dev linux-libc-dev \
      apt-transport-https curl gnupg2 \
   && curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
-  && echo "deb https://deb.nodesource.com/node_15.x bionic main" | tee /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb https://deb.nodesource.com/node_16.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list \
   && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
   && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
   && apt-get update \
@@ -43,7 +43,7 @@ RUN python -m venv /tmp/venv \
   && /tmp/venv/bin/python /tmp/src/tools/convert-docs.py -o /tmp/src/refstack-ui/app/components/about/templates /tmp/src/doc/source/*.rst \
   && rm -rf /tmp/venv
 
-FROM opendevorg/python-base as refstack
+FROM opendevorg/python-base:3.8-bullseye as refstack
 
 COPY --from=builder /output/ /output
 COPY --from=builder /tmp/src/refstack-ui/app/ /refstack-ui/app
@@ -55,4 +55,4 @@ RUN /output/install-from-bindep \
   && rm -rf /output
 
 ENTRYPOINT ["/usr/bin/entrypoint"]
-CMD ["pecan", "serve", "/usr/local/lib/python3.7/site-packages/refstack/api/config.py"]
+CMD ["pecan", "serve", "/usr/local/lib/python3.8/site-packages/refstack/api/config.py"]
diff --git a/zuul.d/docker-images/refstack.yaml b/zuul.d/docker-images/refstack.yaml
index 94feb59551..40838c0718 100644
--- a/zuul.d/docker-images/refstack.yaml
+++ b/zuul.d/docker-images/refstack.yaml
@@ -3,6 +3,10 @@
     name: system-config-build-image-refstack
     description: Build a refstack image.
     parent: system-config-build-image
+    requires: &refstack_requires
+      - python-base-3.8-bullseye-container-image
+      - python-builder-3.8-bullseye-container-image
+    provides: refstack-container-image
     vars: &refstack_vars
       docker_images:
         - context: docker/refstack
@@ -15,8 +19,11 @@
     name: system-config-upload-image-refstack
     description: Build and upload a refstack image.
     parent: system-config-upload-image
+    requires: *refstack_requires
+    provides: refstack-container-image
     vars: *refstack_vars
     files: *refstack_files
+
 - job:
     name: system-config-promote-image-refstack
     description: Promote a previously published refstack image to latest.
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 2ff5ab8d9a..6ec87fe38c 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -1003,7 +1003,8 @@
     ansible-version: 2.9
     description: |
       Run the playbook for refstack server.
-    dependencies: opendev-buildset-registry
+    requires:
+      - refstack-container-image
     timeout: 3600
     nodeset:
       nodes: