Pin submariner version

The current code installed the latest version that the installed subctl
tool can install. Change to install specific version so we can have more
predictable results.

Another benefit is reusing the netest image installed by submariner for
testing it later. Previously we pulled both nettest:0.15.2 and
netest:lastest.

Signed-off-by: Nir Soffer <nsoffer@redhat.com>

test/addons/submariner/base/src/pod.yaml

@@ -10,7 +10,8 @@ metadata:
 spec:
   containers:
     - name: test
-      image: quay.io/submariner/nettest
+      # NOTE: keep in sync with start:VERSION.
+      image: quay.io/submariner/nettest:0.15.2
       command:
         - sh
         - -c

test/addons/submariner/start

@@ -11,6 +11,8 @@ from drenv import cluster as drenv_cluster
 from drenv import kubectl
 from drenv import subctl
 
+VERSION = "0.15.2"
+
 NAMESPACE = "submariner-operator"
 
 BROKER_DEPLOYMENTS = ("submariner-operator",)
@@ -33,7 +35,12 @@ def deploy_broker(broker):
     os.makedirs(broker_dir, exist_ok=True)
 
     print(f"Deploying submariner broker in cluster '{broker}'")
-    subctl.deploy_broker(broker, globalnet=True, broker_info=broker_info)
+    subctl.deploy_broker(
+        broker,
+        globalnet=True,
+        broker_info=broker_info,
+        version=VERSION,
+    )
     print(f"Broker info stored in '{broker_info}'")
 
     print(f"Waiting for submariner broker deployments in cluster '{broker}'")
@@ -47,7 +54,13 @@ def join_cluster(cluster, broker_info):
     drenv_cluster.wait_until_ready(cluster)
 
     print(f"Joining cluster '{cluster}' to broker")
-    subctl.join(broker_info, context=cluster, clusterid=cluster, cable_driver="vxlan")
+    subctl.join(
+        broker_info,
+        context=cluster,
+        clusterid=cluster,
+        cable_driver="vxlan",
+        version=VERSION,
+    )
 
 
 def wait_for_cluster(cluster):

test/drenv/subctl.py

@@ -8,7 +8,7 @@
 BROKER_INFO = "broker-info.subm"
 
 
-def deploy_broker(context, globalnet=False, broker_info=None, log=print):
+def deploy_broker(context, globalnet=False, broker_info=None, version=None, log=print):
     """
     Run subctl deploy-broker ... logging progress messages.
 
@@ -18,20 +18,24 @@ def deploy_broker(context, globalnet=False, broker_info=None, log=print):
     args = ["deploy-broker", "--context", context]
     if globalnet:
         args.append("--globalnet")
+    if version:
+        args.append(f"--version={version}")
 
     _watch(*args, log=log)
 
     if broker_info:
         shutil.move(BROKER_INFO, broker_info)
 
 
-def join(broker_info, context, clusterid, cable_driver=None, log=print):
+def join(broker_info, context, clusterid, cable_driver=None, version=None, log=print):
     """
     Run subctl join ... logging progress messages.
     """
     args = ["join", broker_info, "--context", context, "--clusterid", clusterid]
     if cable_driver:
         args.extend(("--cable-driver", cable_driver))
+    if version:
+        args.append(f"--version={version}")
     _watch(*args, log=log)