From 303e7b9701eff70fa3254ea13bb089a417e9b8bd Mon Sep 17 00:00:00 2001
From: Gaurav Pandey <gauravguitarrocks@gmail.com>
Date: Fri, 2 Apr 2021 14:34:05 +0530
Subject: [PATCH] ci: Add Debian bullseye to production test suite.

---
 .github/workflows/production-suite.yml | 5 +++++
 puppet/zulip/manifests/profile/base.pp | 2 ++
 tools/ci/Dockerfile.template           | 8 ++++++++
 tools/ci/images.yml                    | 3 +++
 tools/ci/production-verify             | 2 +-
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/production-suite.yml b/.github/workflows/production-suite.yml
index 74c9df1a5a..73076073b3 100644
--- a/.github/workflows/production-suite.yml
+++ b/.github/workflows/production-suite.yml
@@ -127,6 +127,11 @@ jobs:
             is_buster: true
             os: buster
 
+          - docker_image: zulip/ci:bullseye
+            name: Bullseye production install
+            is_bullseye: true
+            os: bullseye
+
     name: ${{ matrix.name  }}
     container: ${{ matrix.docker_image }}
     runs-on: ubuntu-latest
diff --git a/puppet/zulip/manifests/profile/base.pp b/puppet/zulip/manifests/profile/base.pp
index e9e903a692..adbc5e4c3a 100644
--- a/puppet/zulip/manifests/profile/base.pp
+++ b/puppet/zulip/manifests/profile/base.pp
@@ -24,6 +24,8 @@ class zulip::profile::base {
         /^9\.[0-9]*$/  => 'stretch',
         /^10\.[0-9]*$/ => 'buster',
         /^11\.[0-9]*$/ => 'bullseye',
+        # This next line is temporary until bullseye releases.
+        /bullseye\/sid/ => 'bullseye',
         # Ubuntu releases
         '12.04' => 'precise',
         '14.04' => 'trusty',
diff --git a/tools/ci/Dockerfile.template b/tools/ci/Dockerfile.template
index 734b988b5e..3d11137949 100644
--- a/tools/ci/Dockerfile.template
+++ b/tools/ci/Dockerfile.template
@@ -105,6 +105,14 @@ RUN export git_version=$(git --version | cut -d ' ' -f3 | cut -d 'v' -f2) && \
       sudo apt-get install -y git; \
     fi
 
+# Remove systemd package as it is not required and hinders with install
+RUN if [ ! "$(dpkg-query -f='$(Version)' --show systemd)" = "" ]; then \
+      apt-get remove --purge --auto-remove systemd -y && \
+      echo 'Package: systemd\nPin: release *\nPin-Priority: -1' | sudo tee -a /etc/apt/preferences.d/systemd && \
+      echo '\n\nPackage: *systemd*\nPin: release *\nPin-Priority: -1' | sudo tee -a /etc/apt/preferences.d/systemd && \
+      echo '\nPackage: systemd:amd64\nPin: release *\nPin-Priority: -1' | sudo tee -a /etc/apt/preferences.d/systemd; \
+    fi
+
 ARG USERNAME=github
 RUN groupadd --gid 3434 $USERNAME \
   && useradd --uid 3434 --gid $USERNAME --shell /bin/bash --create-home $USERNAME \
diff --git a/tools/ci/images.yml b/tools/ci/images.yml
index 6b3369b048..7e4eb9b36f 100644
--- a/tools/ci/images.yml
+++ b/tools/ci/images.yml
@@ -6,3 +6,6 @@ focal:
 
 buster:
   base_image: buildpack-deps:buster-scm
+
+bullseye:
+  base_image: buildpack-deps:bullseye-scm
diff --git a/tools/ci/production-verify b/tools/ci/production-verify
index b5cc57ea56..57ddac896f 100755
--- a/tools/ci/production-verify
+++ b/tools/ci/production-verify
@@ -71,7 +71,7 @@ nginx_version="$(nginx -v 2>&1 | awk '{print $3, $4}' | xargs)"
 
 # Simplify the diff by getting replacing 4-5 digit length numbers with <Length>.
 sed -i 's|Length: [0-9]\+\( [(][0-9]\+[.][0-9]K[)]\)\?|Length: <Length>|' /tmp/http-headers-processed
-if [ "$os_version_codename" = "buster" ]; then
+if [ "$os_version_codename" = "buster" ] || [ "$os_version_codename" = "bullseye" ]; then
     success_header_file="/tmp/success-http-headers.template.debian.txt"
     check_header
 else