Skip to content

Commit

Permalink
Sunset CentOS 7 -- EOL
Browse files Browse the repository at this point in the history
  • Loading branch information
akuzminsky committed Sep 14, 2024
1 parent 4559e48 commit 097467e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/intergration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
PAUSE_TEST: "${{ inputs.pause_test }}"
strategy:
matrix:
version: ["focal", "jammy", "7"]
version: ["focal", "jammy"]
steps:
- uses: "actions/checkout@v3"
- name: "Setup Python env"
Expand Down
9 changes: 4 additions & 5 deletions support/bootstrap/storage_server.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/usr/bin/env bash

set -exu
yum clean all
apt-get update

function install_package() {

for _ in 1 2 3
do
# shellcheck disable=SC2068
yum -y install $@ && break
apt-get -y install $@ && break
sleep 5
done
}
Expand All @@ -21,6 +21,7 @@ function start_sshd() {
/usr/bin/ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -P ""
fi

mkdir -p /run/sshd
mkdir -p /root/.ssh/
/bin/chown root:root /root/.ssh
/bin/chmod 700 /root/.ssh/
Expand All @@ -33,11 +34,9 @@ function start_sshd() {
}


rpm -q epel-release || install_package epel-release
install_package \
openssh-server \
nc \
netcat \
sudo


start_sshd
2 changes: 1 addition & 1 deletion tests/integration/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ def storage_server(docker_client, container_network):
docker_client,
container_network,
last_n=3,
image="centos:centos7",
image="ubuntu:jammy",
command=["bash", bootstrap_script],
)
# docker_execute(docker_client, container["id"], ["bash", bootstrap_script])
Expand Down

0 comments on commit 097467e

Please sign in to comment.