Fix Jenkinsfile typo and clarify support for oracle in TF automation (r…

…ancher#3611) Signed-off-by: rancher-max <[email protected]>
mgfritch · Dec 2, 2022 · 885d251 · 885d251
1 parent d5edded
commit 885d251
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/tests/terraform/modules/install_rke2_master.sh b/tests/terraform/modules/install_rke2_master.sh
@@ -43,7 +43,7 @@ then
    subscription-manager repos --enable=rhel-7-server-extras-rpms
 fi
 
-if [ "$node_os" = "centos8" ] || [ "$node_os" = "rhel8" ]
+if [ "$node_os" = "centos8" ] || [ "$node_os" = "rhel8" ] || [ "$node_os" = "oracle8" ]
 then
   yum install tar -y
   yum install iptables -y
@@ -71,7 +71,7 @@ fi
 sleep 10
 if [ -n "$server_flags" ] && [[ "$server_flags" == *"cis"* ]]
 then
-    if [[ "$node_os" == *"rhel"* ]] || [[ "$node_os" == *"centos"* ]]
+    if [[ "$node_os" == *"rhel"* ]] || [[ "$node_os" == *"centos"* ]] || [[ "$node_os" == *"oracle"* ]]
     then
         cp -f /usr/share/rke2/rke2-cis-sysctl.conf /etc/sysctl.d/60-rke2-cis.conf
     else

diff --git a/tests/terraform/modules/join_rke2_agent.sh b/tests/terraform/modules/join_rke2_agent.sh
@@ -43,7 +43,7 @@ then
    subscription-manager repos --enable=rhel-7-server-extras-rpms
 fi
 
-if [ "$node_os" = "centos8" ] || [ "$node_os" = "rhel8" ]
+if [ "$node_os" = "centos8" ] || [ "$node_os" = "rhel8" ] || [ "$node_os" = "oracle8" ]
 then
   yum install tar -y
   yum install iptables -y
@@ -70,7 +70,7 @@ else
 fi
 if [ -n "$worker_flags" ] && [[ "$worker_flags" == *"cis"* ]]
 then
-    if [[ "$node_os" == *"rhel"* ]] || [[ "$node_os" == *"centos"* ]]
+    if [[ "$node_os" == *"rhel"* ]] || [[ "$node_os" == *"centos"* ]] || [[ "$node_os" == *"oracle"* ]]
     then
         cp -f /usr/share/rke2/rke2-cis-sysctl.conf /etc/sysctl.d/60-rke2-cis.conf
     else

diff --git a/tests/terraform/modules/join_rke2_master.sh b/tests/terraform/modules/join_rke2_master.sh
@@ -46,7 +46,7 @@ then
    subscription-manager repos --enable=rhel-7-server-extras-rpms
 fi
 
-if [ "$node_os" = "centos8" ] || [ "$node_os" = "rhel8" ]
+if [ "$node_os" = "centos8" ] || [ "$node_os" = "rhel8" ] || [ "$node_os" = "oracle8" ]
 then
   yum install tar -y
   yum install iptables -y
@@ -74,7 +74,7 @@ fi
 sleep 10
 if [ -n "$server_flags" ] && [[ "$server_flags" == *"cis"* ]]
 then
-    if [[ "$node_os" == *"rhel"* ]] || [[ "$node_os" == *"centos"* ]]
+    if [[ "$node_os" == *"rhel"* ]] || [[ "$node_os" == *"centos"* ]] || [[ "$node_os" == *"oracle"* ]]
     then
         cp -f /usr/share/rke2/rke2-cis-sysctl.conf /etc/sysctl.d/60-rke2-cis.conf
     else

diff --git a/tests/terraform/scripts/Jenkinsfile b/tests/terraform/scripts/Jenkinsfile
@@ -65,8 +65,8 @@ node {
                     "\nssh_key = \"" + AWS_SSH_KEY_NAME + "\"" +
                     "\naccess_key = \"/go/src/github.com/rancher/rke2/tests/terraform/modules/config/.ssh/aws_key.pem\"" +
                     "\nresource_name = \"" + RKE2_HOSTNAME_PREFIX + "\"" +
-                    "\nke2_version = \"" + RKE2_VERSION + "\"" +
-                    "\nke2_channel = \"" + RKE2_CHANNEL + "\""
+                    "\nrke2_version = \"" + RKE2_VERSION + "\"" +
+                    "\nrke2_channel = \"" + RKE2_CHANNEL + "\""
                 }
 
                 sh "./tests/terraform/scripts/configure.sh"