From dd7ca94f320ed588e2e037c096d424dfe036fb6c Mon Sep 17 00:00:00 2001
From: noname0443 <noname342341@gmail.com>
Date: Fri, 30 Aug 2024 15:23:09 +0300
Subject: [PATCH] Fix tests on jammy (#127)

* Run tests on jammy

* supervisor fix

* fix type

---------

Co-authored-by: Aleksandr Shevchuk <teem0n@yandex-team.ru>
---
 .github/workflows/docker-jepsen.yml    |  2 +-
 .github/workflows/docker-tests-8.0.yml |  4 +-
 .github/workflows/docker-tests.yml     |  4 +-
 .github/workflows/unit-tests.yml       |  2 +-
 tests/images/base/Dockerfile           |  2 +-
 tests/images/base/setup.sh             | 61 +++++++++++++-------------
 tests/images/zookeeper/setup.sh        |  2 +-
 tests/testutil/docker_composer.go      |  2 +-
 8 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/docker-jepsen.yml b/.github/workflows/docker-jepsen.yml
index 1e08c2b9..1985556b 100644
--- a/.github/workflows/docker-jepsen.yml
+++ b/.github/workflows/docker-jepsen.yml
@@ -10,7 +10,7 @@ env:
 jobs:
   test:
     name: jepsen
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Set up Go 1.x
         uses: actions/setup-go@v5
diff --git a/.github/workflows/docker-tests-8.0.yml b/.github/workflows/docker-tests-8.0.yml
index 7b4e85f9..01d3a90a 100644
--- a/.github/workflows/docker-tests-8.0.yml
+++ b/.github/workflows/docker-tests-8.0.yml
@@ -13,7 +13,7 @@ env:
 jobs:
   buildimages:
     name: Build images
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
     
   test:
     name: test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: [ buildimages ]
     strategy:
       matrix:
diff --git a/.github/workflows/docker-tests.yml b/.github/workflows/docker-tests.yml
index c5b80118..af7c9fb3 100644
--- a/.github/workflows/docker-tests.yml
+++ b/.github/workflows/docker-tests.yml
@@ -13,7 +13,7 @@ env:
 jobs:
   buildimages:
     name: Build images
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
     
   test:
     name: test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: [ buildimages ]
     strategy:
       matrix:
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 92e0db24..8e5add53 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -13,7 +13,7 @@ env:
 jobs:
   unittest:
     name: all_unittests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Set up Go 1.x
         uses: actions/setup-go@v5
diff --git a/tests/images/base/Dockerfile b/tests/images/base/Dockerfile
index ab7a7995..98ab54bc 100644
--- a/tests/images/base/Dockerfile
+++ b/tests/images/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 ENV container docker
 ENV DEBIAN_FRONTEND noninteractive
 ENV ZK_VERSION=3.7.1
diff --git a/tests/images/base/setup.sh b/tests/images/base/setup.sh
index 313728ea..aa91d2a1 100644
--- a/tests/images/base/setup.sh
+++ b/tests/images/base/setup.sh
@@ -1,7 +1,6 @@
-
 set -xe
 
-cat <<EOF > /etc/apt/apt.conf.d/01buildconfig
+cat <<EOF >/etc/apt/apt.conf.d/01buildconfig
 APT::Install-Recommends "0";
 APT::Get::Assume-Yes "true";
 APT::Install-Suggests "0";
@@ -10,41 +9,41 @@ EOF
 apt-get update
 
 apt-get install \
-    wget \
-    ca-certificates \
-    lsb-release \
-    gpg-agent \
-    apt-utils \
-    software-properties-common
+  wget \
+  ca-certificates \
+  lsb-release \
+  gpg-agent \
+  apt-utils \
+  software-properties-common
 
-apt-key add - < /var/lib/dist/base/percona.gpg
-add-apt-repository 'deb http://mirror.yandex.ru/mirrors/percona/percona/apt bionic main'
-add-apt-repository 'deb http://mirror.yandex.ru/mirrors/percona/ps-80/apt bionic main'
+apt-key add - </var/lib/dist/base/percona.gpg
+add-apt-repository 'deb http://mirror.yandex.ru/mirrors/percona/percona/apt jammy main'
+add-apt-repository 'deb http://mirror.yandex.ru/mirrors/percona/ps-80/apt jammy main'
 
 # common
 apt-get update
 apt-get install \
-    apt-utils \
-    openjdk-11-jre-headless \
-    less \
-    bind9-host \
-    net-tools \
-    netcat \
-    iputils-ping \
-    sudo \
-    telnet \
-    git \
-    python3-pip \
-    python3-setuptools \
-    faketime \
-    rsync \
-    vim \
-    iptables
+  apt-utils \
+  openjdk-11-jre-headless \
+  less \
+  bind9-host \
+  net-tools \
+  netcat \
+  iputils-ping \
+  sudo \
+  telnet \
+  git \
+  python3-pip \
+  python3-setuptools \
+  faketime \
+  rsync \
+  vim \
+  iptables
 rm -rf /var/run
 ln -s /dev/shm /var/run
 
 # ssh
-apt-get install  openssh-server
+apt-get install openssh-server
 mkdir -p /run/sshd
 cp /var/lib/dist/base/sshd_config /etc/ssh/sshd_config
 mkdir /root/.ssh
@@ -68,11 +67,11 @@ fi
 rm -rf /var/lib/mysql/*
 
 # supervisor
-pip3 install git+https://github.com/Supervisor/supervisor.git@4619168a4d820b37641a4719e211cf867bd7f49d
+pip3 install git+https://github.com/Supervisor/supervisor.git@18b59a1403778766561ab49b18cf2558e8a4d227
 mkdir -p /etc/supervisor/conf.d
 cp /var/lib/dist/base/supervisor.conf /etc/supervisor/supervisord.conf
 cp /var/lib/dist/base/supervisor_ssh.conf /etc/supervisor/conf.d
 
 # zookeeper
-wget -nc -O - --quiet https://archive.apache.org/dist/zookeeper/zookeeper-${ZK_VERSION}/apache-zookeeper-${ZK_VERSION}-bin.tar.gz | tar -xz -C /opt && \
-mv /opt/apache-zookeeper* /opt/zookeeper
+wget -nc -O - --quiet https://archive.apache.org/dist/zookeeper/zookeeper-${ZK_VERSION}/apache-zookeeper-${ZK_VERSION}-bin.tar.gz | tar -xz -C /opt &&
+  mv /opt/apache-zookeeper* /opt/zookeeper
diff --git a/tests/images/zookeeper/setup.sh b/tests/images/zookeeper/setup.sh
index f5336aa9..473d5e40 100644
--- a/tests/images/zookeeper/setup.sh
+++ b/tests/images/zookeeper/setup.sh
@@ -1,3 +1,3 @@
 set -e
 
-cp /var/lib/dist/zookeeper/supervisor_zookeeper.conf /etc/supervisor/conf.d
\ No newline at end of file
+cp /var/lib/dist/zookeeper/supervisor_zookeeper.conf /etc/supervisor/conf.d
diff --git a/tests/testutil/docker_composer.go b/tests/testutil/docker_composer.go
index b1b6deee..a0411760 100644
--- a/tests/testutil/docker_composer.go
+++ b/tests/testutil/docker_composer.go
@@ -79,7 +79,7 @@ func NewDockerComposer(project, config string) (*DockerComposer, error) {
 		project = filepath.Base(filepath.Dir(config))
 	}
 	dc := new(DockerComposer)
-	api, err := client.NewClientWithOpts(client.FromEnv)
+	api, err := client.NewClientWithOpts(client.FromEnv, client.WithVersion("1.43"))
 	if err != nil {
 		return nil, fmt.Errorf("failed to connect to docker: %s", err)
 	}