Merge pull request openshift-kni#25 from fedepaol/ci-sctp-setup

Have a custom pool that matches two out of three nodes.

feature-configs/base/sctp/is_ready.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # no output means that the new machine config wasn't picked by MCO yet
-if [ -z "$(oc get mcp worker -o jsonpath='{.spec.configuration.source[?(@.name=="load-sctp-module")].name}')" ]; then
+if [ -z "$(oc get mcp worker-cnf -o jsonpath='{.spec.configuration.source[?(@.name=="load-sctp-module")].name}')" ]; then
     exit 1
 fi
 
-oc wait mcp/worker --for condition=updated --timeout 1s
+oc wait mcp/worker-cnf --for condition=updated --timeout 1s

feature-configs/base/sctp/sctp_module_mc.yaml

@@ -2,7 +2,7 @@ apiVersion: machineconfiguration.openshift.io/v1
 kind: MachineConfig
 metadata:
   labels:
-    machineconfiguration.openshift.io/role: worker-sctp
+    machineconfiguration.openshift.io/role: worker-cnf
   name: load-sctp-module
 spec:
   config:

feature-configs/e2e-gcp/sctp/sctp_module_mc_patch.yaml

@@ -2,5 +2,5 @@ apiVersion: machineconfiguration.openshift.io/v1
 kind: MachineConfig
 metadata:
   labels:
-    machineconfiguration.openshift.io/role: worker
+    machineconfiguration.openshift.io/role: worker-cnf
   name: load-sctp-module

functests/sctp/sctp.go

@@ -21,15 +21,22 @@ import (
 const mcYaml = "../sctp/sctp_module_mc.yaml"
 const hostnameLabel = "kubernetes.io/hostname"
 const testNamespace = "sctptest"
-const sctpNodeSelector = "node-role.kubernetes.io/worker-sctp="
 
-var testerImage string
+var (
+	testerImage      string
+	sctpNodeSelector string
+)
 
 func init() {
 	testerImage = os.Getenv("SCTPTEST_IMAGE")
 	if testerImage == "" {
 		testerImage = "quay.io/fpaoline/sctptester:v1.0"
 	}
+
+	sctpNodeSelector = os.Getenv("SCTPTEST_NODE_SELECTOR")
+	if sctpNodeSelector == "" {
+		sctpNodeSelector = "node-role.kubernetes.io/worker-cnf="
+	}
 }
 
 var _ = Describe("sctp", func() {

hack/setup-test-cluster.sh

@@ -5,24 +5,45 @@ set -e
 # expect oc to be in PATH by default
 export OC_TOOL="${OC_TOOL:-oc}"
 
-# Label 1 worker node as worker-rt
-echo "[INFO]: Labeling 1 worker node with worker-rt"
-node=$(${OC_TOOL} get nodes --selector='node-role.kubernetes.io/worker' -o name | head -1)
-${OC_TOOL} label $node node-role.kubernetes.io/worker-rt=""
-
-# Label 2 worker node as worker-sctp
-echo "[INFO]: Labeling 2 worker node with worker-sctp"
-nodes=$(${OC_TOOL} get nodes --selector='node-role.kubernetes.io/worker' -o name | sed -n 2,3p)
+# Label 2 worker nodes as worker-cnf
+echo "[INFO]: Labeling 2 worker nodes with worker-cnf"
+nodes=$(${OC_TOOL} get nodes --selector='node-role.kubernetes.io/worker' -o name | sed -n 1,2p)
 for node in $nodes
 do
-    ${OC_TOOL} label $node node-role.kubernetes.io/worker-sctp=""
+    ${OC_TOOL} label $node node-role.kubernetes.io/worker-cnf=""
 done
 
+
+# Note: this is intended to be the only pool we apply all mcs to.
+# Additional mcs must be added to this poll in the selector
+cat <<EOF | ${OC_TOOL} apply -f -
+apiVersion: machineconfiguration.openshift.io/v1
+kind: MachineConfigPool
+metadata:
+  name: worker-cnf
+  labels:
+    worker-cnf: ""
+spec:
+  machineConfigSelector:
+    matchExpressions:
+      - {
+          key: machineconfiguration.openshift.io/role,
+          operator: In,
+          values: [worker-cnf, worker],
+        }
+  maxUnavailable: null
+  paused: false
+  nodeSelector:
+    matchLabels:
+      node-role.kubernetes.io/worker-cnf: ""
+---
+EOF
+
 echo "[INFO]: Pausing"
 # TODO patching to prevent https://bugzilla.redhat.com/show_bug.cgi?id=1792749 from happening
 # remove this once the bug is fixed
 mcps=$(${OC_TOOL} get mcp --no-headers -o custom-columns=":metadata.name")
 for mcp in $mcps
 do
     ${OC_TOOL} patch mcp "${mcp}" -p '{"spec":{"paused":true}}' --type=merge
-done
+done