Skip to content
This repository has been archived by the owner on Feb 9, 2024. It is now read-only.

Commit

Permalink
[6.1.x] Enable RHEL 8.3 install testing (#2351)
Browse files Browse the repository at this point in the history
* Upgrade robotest to 2.2.0.
* Specify CentOS:7.9 instead of the abstract 7.
* Enable install testing on RHEL 8.3 with SELinux off.
  • Loading branch information
wadells authored Dec 3, 2020
1 parent 96bd959 commit 07ee9dd
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
4 changes: 4 additions & 0 deletions build.assets/robotest/disableSELinux.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
setenforce Permissive
sed -i s/^SELINUX=.*$/SELINUX=permissive/ /etc/selinux/config
sestatus
18 changes: 9 additions & 9 deletions build.assets/robotest/pr_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ declare -A UPGRADE_MAP

UPGRADE_MAP[$(recommended_upgrade_tag $(branch 6.1.x))]="ubuntu:18" # this branch
UPGRADE_MAP[6.1.0]="ubuntu:16"
UPGRADE_MAP[$(recommended_upgrade_tag $(branch 5.5.x))]="redhat:7" # compatible LTS version
UPGRADE_MAP[5.5.0]="centos:7"
UPGRADE_MAP[$(recommended_upgrade_tag $(branch 5.5.x))]="redhat:7.9" # compatible LTS version
UPGRADE_MAP[5.5.0]="centos:7.9"
# 5.6.x upgrade testing disabled on PRs because it has been out of support for over a year
# UPGRADE_MAP[$(recommended_upgrade_tag $(branch 5.6.x))]="debian:9" # compatible non-LTS version
# UPGRADE_MAP[5.6.0]="debian:8"

# customer specific scenarios, these versions have traction in the field
UPGRADE_MAP[5.5.40]="centos:7"
UPGRADE_MAP[5.5.38]="centos:7"
UPGRADE_MAP[5.5.36]="centos:7"
UPGRADE_MAP[5.5.28]="centos:7"
UPGRADE_MAP[5.5.40]="centos:7.9"
UPGRADE_MAP[5.5.38]="centos:7.9"
UPGRADE_MAP[5.5.36]="centos:7.9"
UPGRADE_MAP[5.5.28]="centos:7.9"

UPGRADE_VERSIONS=${!UPGRADE_MAP[@]}

Expand All @@ -41,7 +41,7 @@ function build_upgrade_suite {
function build_resize_suite {
local suite=$(cat <<EOF
resize={"to":3,"flavor":"one","nodes":1,"role":"node","state_dir":"/var/lib/telekube","os":"ubuntu:18","storage_driver":"overlay2"}
shrink={"nodes":3,"flavor":"three","role":"node","os":"redhat:7"}
shrink={"nodes":3,"flavor":"three","role":"node","os":"redhat:7.9"}
EOF
)
echo -n $suite
Expand All @@ -57,10 +57,10 @@ EOF

function build_install_suite {
local suite=''
local test_os="redhat:7"
local test_os="redhat:8.3"
local cluster_size='"flavor":"three","nodes":3,"role":"node"'
suite+=$(cat <<EOF
install={${cluster_size},"os":"${test_os}","storage_driver":"overlay2"}
install={${cluster_size},"os":"${test_os}","script":{"url":"/disableSELinux.sh"},"storage_driver":"overlay2"}
EOF
)
suite+=' '
Expand Down
5 changes: 3 additions & 2 deletions build.assets/robotest/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ readonly ROBOTEST_SCRIPT=$(mktemp -d)/runsuite.sh

# a number of environment variables are expected to be set
# see https://github.com/gravitational/robotest/blob/v2.0.0/suite/README.md
export ROBOTEST_VERSION=${ROBOTEST_VERSION:-2.1.0}
export ROBOTEST_VERSION=${ROBOTEST_VERSION:-2.2.0}
export ROBOTEST_REPO=quay.io/gravitational/robotest-suite:$ROBOTEST_VERSION
export INSTALLER_URL=$GRAVITY_BUILDDIR/telekube.tar
export GRAVITY_URL=$GRAVITY_BUILDDIR/gravity
Expand Down Expand Up @@ -49,7 +49,8 @@ function build_volume_mounts {
done
}

export EXTRA_VOLUME_MOUNTS=$(build_volume_mounts)
SCRIPT_MOUNT="-v $(readlink -f $(dirname $0))/disableSELinux.sh:/disableSELinux.sh"
export EXTRA_VOLUME_MOUNTS="$(build_volume_mounts) $SCRIPT_MOUNT"

tele=$GRAVITY_BUILDDIR/tele
mkdir -p $UPGRADE_FROM_DIR
Expand Down

0 comments on commit 07ee9dd

Please sign in to comment.