Fix CICD k8s deployments with calico
Change-Id: I7b6b1700cda20c4075d290051e0463fb74693958
diff --git a/jobs/pipelines/swarm-bootstrap-salt-cluster-devops.groovy b/jobs/pipelines/swarm-bootstrap-salt-cluster-devops.groovy
index 6b9370e..ce32c24 100644
--- a/jobs/pipelines/swarm-bootstrap-salt-cluster-devops.groovy
+++ b/jobs/pipelines/swarm-bootstrap-salt-cluster-devops.groovy
@@ -93,7 +93,7 @@
export LAB_CONFIG_NAME=${LAB_CONFIG_NAME}
export MANAGER=devops
export SHUTDOWN_ENV_ON_TEARDOWN=false
- export BOOTSTRAP_TIMEOUT=900
+ export BOOTSTRAP_TIMEOUT=1200
export PYTHONIOENCODING=UTF-8
export REPOSITORY_SUITE=${MCP_VERSION}
export TEST_GROUP=test_bootstrap_salt
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/environment-context-k8s-sl.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/environment-context-k8s-sl.yaml
index 44d0ce1..bfff297 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/environment-context-k8s-sl.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/environment-context-k8s-sl.yaml
@@ -85,7 +85,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
ctl02:
reclass_storage_name: kubernetes_control_node02
@@ -96,7 +96,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
ctl03:
reclass_storage_name: kubernetes_control_node03
@@ -107,7 +107,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
cmp001:
reclass_storage_name: kubernetes_compute_node01
@@ -119,7 +119,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
single_address: ${_param:kubernetes_compute_node01_address}
cmp002:
@@ -132,7 +132,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
single_address: ${_param:kubernetes_compute_node02_address}
cmp003:
@@ -145,7 +145,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
single_address: ${_param:kubernetes_compute_node03_address}
cmp004:
@@ -158,7 +158,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
single_address: ${_param:kubernetes_compute_node04_address}
mon01:
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico/environment-context-k8s.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico/environment-context-k8s.yaml
index 6069be3..8af2c0c 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-calico/environment-context-k8s.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-calico/environment-context-k8s.yaml
@@ -85,7 +85,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
ctl02:
reclass_storage_name: kubernetes_control_node02
@@ -96,7 +96,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
ctl03:
reclass_storage_name: kubernetes_control_node03
@@ -107,7 +107,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
cmp001:
reclass_storage_name: kubernetes_compute_node01
@@ -119,7 +119,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
single_address: ${_param:kubernetes_compute_node01_address}
cmp002:
@@ -132,7 +132,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
single_address: ${_param:kubernetes_compute_node02_address}
cmp003:
@@ -145,7 +145,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
single_address: ${_param:kubernetes_compute_node03_address}
cmp004:
@@ -158,5 +158,5 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
single_address: ${_param:kubernetes_compute_node04_address}
diff --git a/tcp_tests/templates/cookied-cicd-k8s-genie/environment-context-k8s-genie.yaml b/tcp_tests/templates/cookied-cicd-k8s-genie/environment-context-k8s-genie.yaml
index 6069be3..8af2c0c 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-genie/environment-context-k8s-genie.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-genie/environment-context-k8s-genie.yaml
@@ -85,7 +85,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
ctl02:
reclass_storage_name: kubernetes_control_node02
@@ -96,7 +96,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
ctl03:
reclass_storage_name: kubernetes_control_node03
@@ -107,7 +107,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
cmp001:
reclass_storage_name: kubernetes_compute_node01
@@ -119,7 +119,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
single_address: ${_param:kubernetes_compute_node01_address}
cmp002:
@@ -132,7 +132,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
single_address: ${_param:kubernetes_compute_node02_address}
cmp003:
@@ -145,7 +145,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
single_address: ${_param:kubernetes_compute_node03_address}
cmp004:
@@ -158,5 +158,5 @@
ens3:
role: single_dhcp
ens4:
- role: single_ctl
+ role: single_ctl_calico
single_address: ${_param:kubernetes_compute_node04_address}