From b07d5eca37476d685ecd0ccc836ca731e334af86 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 9 Dec 2021 15:10:54 -0800
Subject: [PATCH] Update matrix-eavesdrop image to bullseye

Just some spring cleaning now that bullseye is released.

Change-Id: I9641dae9ee7679fb45bef93e770f69d9673d75bf
---
 docker/matrix-eavesdrop/Dockerfile     | 4 ++--
 docker/matrix-eavesdrop/src/bindep.txt | 4 ++--
 zuul.d/docker-images/eavesdrop.yaml    | 4 ++--
 zuul.d/project.yaml                    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker/matrix-eavesdrop/Dockerfile b/docker/matrix-eavesdrop/Dockerfile
index 92cc5e48c4..fc43e91806 100644
--- a/docker/matrix-eavesdrop/Dockerfile
+++ b/docker/matrix-eavesdrop/Dockerfile
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM docker.io/opendevorg/python-builder:3.9 as builder
+FROM docker.io/opendevorg/python-builder:3.9-bullseye as builder
 
 COPY src /tmp/src
 RUN assemble
 
-FROM docker.io/opendevorg/python-base:3.9 as eavesdrop
+FROM docker.io/opendevorg/python-base:3.9-bullseye as eavesdrop
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep \
diff --git a/docker/matrix-eavesdrop/src/bindep.txt b/docker/matrix-eavesdrop/src/bindep.txt
index 16b91ae828..e65b421f3f 100644
--- a/docker/matrix-eavesdrop/src/bindep.txt
+++ b/docker/matrix-eavesdrop/src/bindep.txt
@@ -1,7 +1,7 @@
 gcc [compile test]
 libc6-dev [compile test]
 libffi-dev [compile test]
-libolm-dev/buster-backports [compile test]
+libolm-dev [compile test]
 make [compile test]
 python3-dev [compile test]
-libolm3/buster-backports
+libolm3
diff --git a/zuul.d/docker-images/eavesdrop.yaml b/zuul.d/docker-images/eavesdrop.yaml
index de2ceea857..64ee4a0a96 100644
--- a/zuul.d/docker-images/eavesdrop.yaml
+++ b/zuul.d/docker-images/eavesdrop.yaml
@@ -4,8 +4,8 @@
     description: Build a matrix-eavesdrop image.
     parent: system-config-build-image
     requires: &matrix-eavesdrop_requires
-      - python-base-3.9-buster-container-image
-      - python-builder-3.9-buster-container-image
+      - python-base-3.9-bullseye-container-image
+      - python-builder-3.9-bullseye-container-image
     provides: matrix-eavesdrop-container-image
     vars: &matrix-eavesdrop_vars
       docker_images:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 0894e181f4..e4cf734d6f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -143,7 +143,7 @@
         - system-config-build-image-matrix-eavesdrop:
             dependencies:
               - name: opendev-buildset-registry
-              - name: system-config-build-image-python-builder-3.9-buster
+              - name: system-config-build-image-python-builder-3.9-bullseye
                 soft: true
         - system-config-build-image-python-base-3.7-buster
         - system-config-build-image-python-base-3.8-buster
@@ -293,7 +293,7 @@
         - system-config-upload-image-matrix-eavesdrop:
             dependencies:
               - name: opendev-buildset-registry
-              - name: system-config-upload-image-python-builder-3.9-buster
+              - name: system-config-upload-image-python-builder-3.9-bullseye
                 soft: true
         - system-config-upload-image-python-base-3.7-buster
         - system-config-upload-image-python-base-3.8-buster