Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ci: Add Debian bullseye to production test suite.

This commit is contained in:
Gaurav Pandey 2021-04-02 14:34:05 +05:30 committed by Tim Abbott
parent feb720b463
commit 303e7b9701
5 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/production-suite.yml vendored
View File

@ -127,6 +127,11 @@ jobs:
is_buster: true is_buster: true
os: buster os: buster
- docker_image: zulip/ci:bullseye
name: Bullseye production install
is_bullseye: true
os: bullseye
name: ${{ matrix.name }} name: ${{ matrix.name }}
container: ${{ matrix.docker_image }} container: ${{ matrix.docker_image }}
runs-on: ubuntu-latest runs-on: ubuntu-latest

2
puppet/zulip/manifests/profile/base.pp
View File

@ -24,6 +24,8 @@ class zulip::profile::base {
/^9\.[0-9]*$/ => 'stretch', /^9\.[0-9]*$/ => 'stretch',
/^10\.[0-9]*$/ => 'buster', /^10\.[0-9]*$/ => 'buster',
/^11\.[0-9]*$/ => 'bullseye', /^11\.[0-9]*$/ => 'bullseye',
# This next line is temporary until bullseye releases.
/bullseye\/sid/ => 'bullseye',
# Ubuntu releases # Ubuntu releases
'12.04' => 'precise', '12.04' => 'precise',
'14.04' => 'trusty', '14.04' => 'trusty',

8
tools/ci/Dockerfile.template
View File

@ -105,6 +105,14 @@ RUN export git_version=$(git --version | cut -d ' ' -f3 | cut -d 'v' -f2) && \
sudo apt-get install -y git; \ sudo apt-get install -y git; \
fi 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 ARG USERNAME=github
RUN groupadd --gid 3434 $USERNAME \ RUN groupadd --gid 3434 $USERNAME \
&& useradd --uid 3434 --gid $USERNAME --shell /bin/bash --create-home $USERNAME \ && useradd --uid 3434 --gid $USERNAME --shell /bin/bash --create-home $USERNAME \

3
tools/ci/images.yml
View File

@ -6,3 +6,6 @@ focal:
buster: buster:
base_image: buildpack-deps:buster-scm base_image: buildpack-deps:buster-scm
bullseye:
base_image: buildpack-deps:bullseye-scm

2
tools/ci/production-verify
View File

@ -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>. # 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 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" success_header_file="/tmp/success-http-headers.template.debian.txt"
check_header check_header
else else