test: do not enable opencontrail probe by default to avoid unrelated error

Author: safchain

Makefile

@@ -162,6 +162,7 @@ endif
 
 ifeq ($(WITH_OPENCONTRAIL), true)
   BUILD_TAGS+=opencontrail
+  EXTRA_ARGS+=-opencontrail
 ifeq ($(OS_RHEL),Y)
   STATIC_LIBS+=libxml2.a
 endif

scripts/ci/opencontrail-tests.nix

@@ -15,7 +15,7 @@ let
   testScript = ''
     # This is to wait until OpenContrail is ready
     $machine->waitUntilSucceeds("curl -s http://localhost:8083/Snh_ShowBgpNeighborSummaryReq | grep machine | grep -q Established");
-    $machine->succeed("${skydiveTestFunctionals} -test.run TestOpenContrail -standalone");
+    $machine->succeed("${skydiveTestFunctionals} -test.run TestOpenContrail -standalone -opencontrail");
   '';
 
 in 

scripts/ci/run-functional-tests.sh

@@ -7,5 +7,5 @@ DIR="$(dirname "$0")"
 
 . "$DIR/run-tests-utils.sh"
 network_setup
-tests_run
+WITH_OPENCONTRAIL=false tests_run
 exit $RETCODE

tests/tests.go

@@ -87,9 +87,9 @@ agent:
       - ovsdb
       - docker
       - lxd
-      - opencontrail
       - lldp
       - runc
+      {{.OpencontrailProbe}}
     netlink:
       metrics_update: 5
     lldp:
@@ -219,6 +219,7 @@ var (
 	noOFTests         bool
 	standalone        bool
 	topologyBackend   string
+	opencontrailProbe bool
 )
 
 func initConfig(conf string, params ...helperParams) error {
@@ -268,6 +269,9 @@ func initConfig(conf string, params ...helperParams) error {
 	if analyzerProbes != "" {
 		params[0]["AnalyzerProbes"] = strings.Split(analyzerProbes, ",")
 	}
+	if opencontrailProbe {
+		params[0]["OpencontrailProbe"] = "- opencontrail"
+	}
 
 	tmpl, err := template.New("config").Parse(conf)
 	if err != nil {
@@ -782,6 +786,7 @@ func init() {
 	flag.StringVar(&flowBackend, "analyzer.flow.backend", "", "Specify the flow storage backend used")
 	flag.StringVar(&analyzerListen, "analyzer.listen", "0.0.0.0:64500", "Specify the analyzer listen address")
 	flag.StringVar(&analyzerProbes, "analyzer.topology.probes", "", "Specify the analyzer probes to enable")
+	flag.BoolVar(&opencontrailProbe, "opencontrail", false, "Enable opencontrail probe")
 	flag.Parse()
 
 	http.DefaultTransport.(*http.Transport).MaxIdleConnsPerHost = 100