Meridio: Add default route arg to e2e
Use of e2e feature implemented in:
https://github.com/Nordix/Meridio/pull/501
Change-Id: Ic1f4e34e11b98fc5865759efd4a620f6a9309392
diff --git a/jjb/nsm/e2e.Jenkinsfile b/jjb/nsm/e2e.Jenkinsfile
index bba5467..26b64b3 100644
--- a/jjb/nsm/e2e.Jenkinsfile
+++ b/jjb/nsm/e2e.Jenkinsfile
@@ -33,6 +33,7 @@
def environment_name = params.ENVIRONMENT_NAME
def focus = params.FOCUS
def skip = params.SKIP
+ def kind_external_host_default_route = params.KIND_EXTERNAL_HOST_DEFAULT_ROUTE
def seed = params.SEED
@@ -53,7 +54,7 @@
stage('Environment') {
currentBuild.description = "Meridio version: $meridio_version / TAPA version: $tapa_version / NSM version: $nsm_version / IP Family: $ip_family / Kubernetes version: $kubernetes_version / Current Branch: $current_branch / Seed: $seed"
- def command = "make -s -C test/e2e/environment/$environment_name/ KUBERNETES_VERSION=$kubernetes_version NSM_VERSION=$nsm_version IP_FAMILY=$ip_family KUBERNETES_WORKERS=$number_of_workers MERIDIO_VERSION=$meridio_version TAPA_VERSION=$tapa_version"
+ def command = "make -s -C test/e2e/environment/$environment_name/ KUBERNETES_VERSION=$kubernetes_version NSM_VERSION=$nsm_version IP_FAMILY=$ip_family KUBERNETES_WORKERS=$number_of_workers MERIDIO_VERSION=$meridio_version TAPA_VERSION=$tapa_version KIND_EXTERNAL_HOST_DEFAULT_ROUTE=$kind_external_host_default_route"
try {
ExecSh(command).call()
} catch (org.jenkinsci.plugins.workflow.steps.FlowInterruptedException e) {
diff --git a/jjb/nsm/meridio-e2e-test-kind.yaml b/jjb/nsm/meridio-e2e-test-kind.yaml
index 4bf2c1b..2a16b74 100644
--- a/jjb/nsm/meridio-e2e-test-kind.yaml
+++ b/jjb/nsm/meridio-e2e-test-kind.yaml
@@ -105,6 +105,10 @@
name: FOCUS
default: ""
description: e2e tests to focus
+ - string:
+ name: KIND_EXTERNAL_HOST_DEFAULT_ROUTE
+ default: 'yes'
+ description: Kind gateway to advertise default or non-default routes
- bool:
name: DRY_RUN
default: false