From 07ee9dd4ad43adc0d0cb00af09041cf6b23a6d3e Mon Sep 17 00:00:00 2001
From: Walt <walt@gravitational.com>
Date: Thu, 3 Dec 2020 10:35:14 -0800
Subject: [PATCH] [6.1.x] Enable RHEL 8.3 install testing (#2351)

* 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.
---
 build.assets/robotest/disableSELinux.sh |  4 ++++
 build.assets/robotest/pr_config.sh      | 18 +++++++++---------
 build.assets/robotest/run.sh            |  5 +++--
 3 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100755 build.assets/robotest/disableSELinux.sh

diff --git a/build.assets/robotest/disableSELinux.sh b/build.assets/robotest/disableSELinux.sh
new file mode 100755
index 0000000000..49ba67b8e1
--- /dev/null
+++ b/build.assets/robotest/disableSELinux.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+setenforce Permissive
+sed -i s/^SELINUX=.*$/SELINUX=permissive/ /etc/selinux/config
+sestatus
diff --git a/build.assets/robotest/pr_config.sh b/build.assets/robotest/pr_config.sh
index 61478c6081..f0e07ad912 100755
--- a/build.assets/robotest/pr_config.sh
+++ b/build.assets/robotest/pr_config.sh
@@ -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[@]}
 
@@ -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
@@ -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+=' '
diff --git a/build.assets/robotest/run.sh b/build.assets/robotest/run.sh
index 4a904af5f0..a756736667 100755
--- a/build.assets/robotest/run.sh
+++ b/build.assets/robotest/run.sh
@@ -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
@@ -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