Merge "Add target var to be possible to run tests from it"
diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index 4799596..0313d4d 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -44,13 +44,6 @@
*
* optional parameters for overwriting soft params
* SALT_OVERRIDES YAML with overrides for Salt deployment
- * KUBERNETES_HYPERKUBE_IMAGE Docker repository and tag for hyperkube image
- * CALICO_CNI_IMAGE Docker repository and tag for calico CNI image
- * CALICO_NODE_IMAGE Docker repository and tag for calico node image
- * CALICOCTL_IMAGE Docker repository and tag for calicoctl image
- * MTU MTU for Calico
- * NETCHECKER_AGENT_IMAGE Docker repository and tag for netchecker agent image
- * NETCHECKER_SERVER_IMAGE Docker repository and tag for netchecker server image
*
*/
@@ -185,67 +178,6 @@
// install k8s
if (common.checkContains('STACK_INSTALL', 'k8s')) {
- // Deprecated stage. Use SALT_OVERRIDES instead.
- stage('Overwrite Kubernetes parameters') {
-
- // Overwrite Kubernetes vars if specified
- if (env.getEnvironment().containsKey('KUBERNETES_HYPERKUBE_IMAGE')) {
- salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'reclass.cluster_meta_set', ['kubernetes_hyperkube_image', KUBERNETES_HYPERKUBE_IMAGE])
- }
- if (env.getEnvironment().containsKey('MTU')) {
- salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'reclass.cluster_meta_set', ['kubernetes_mtu', MTU])
- }
-
- // Overwrite Calico vars if specified
- if (env.getEnvironment().containsKey('CALICO_CNI_IMAGE')) {
- salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'reclass.cluster_meta_set', ['kubernetes_calico_cni_image', CALICO_CNI_IMAGE])
- }
- if (env.getEnvironment().containsKey('CALICO_NODE_IMAGE')) {
- salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'reclass.cluster_meta_set', ['kubernetes_calico_image', CALICO_NODE_IMAGE])
- }
- if (env.getEnvironment().containsKey('CALICOCTL_IMAGE')) {
- salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'reclass.cluster_meta_set', ['kubernetes_calicoctl_image', CALICOCTL_IMAGE])
- }
- if (env.getEnvironment().containsKey('CALICO_POLICY_IMAGE')) {
- salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'reclass.cluster_meta_set', ['kubernetes_calico_policy_image', CALICO_POLICY_IMAGE])
- }
-
- // Overwrite Virtlet image if specified
- if (env.getEnvironment().containsKey('VIRTLET_IMAGE')) {
- salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'reclass.cluster_meta_set', ['kubernetes_virtlet_image', VIRTLET_IMAGE])
- }
-
- // Overwrite netchecker vars if specified
- if (env.getEnvironment().containsKey('NETCHECKER_AGENT_IMAGE')) {
- salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'reclass.cluster_meta_set', ['kubernetes_netchecker_agent_image', NETCHECKER_AGENT_IMAGE])
- }
- if (env.getEnvironment().containsKey('NETCHECKER_SERVER_IMAGE')) {
- salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'reclass.cluster_meta_set', ['kubernetes_netchecker_server_image', NETCHECKER_SERVER_IMAGE])
- }
-
- // Overwrite docker version if specified
- if (env.getEnvironment().containsKey('DOCKER_ENGINE')) {
- salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'reclass.cluster_meta_set', ['kubernetes_docker_package', DOCKER_ENGINE])
- }
-
- // Overwrite addons vars if specified
- if (env.getEnvironment().containsKey('HELM_ENABLED')) {
- salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'reclass.cluster_meta_set', ['kubernetes_helm_enabled', HELM_ENABLED])
- }
- if (env.getEnvironment().containsKey('NETCHECKER_ENABLED')) {
- salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'reclass.cluster_meta_set', ['kubernetes_netchecker_enabled', NETCHECKER_ENABLED])
- }
- if (env.getEnvironment().containsKey('CALICO_POLICY_ENABLED')) {
- salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'reclass.cluster_meta_set', ['kubernetes_calico_policy_enabled', CALICO_POLICY_ENABLED])
- }
- if (env.getEnvironment().containsKey('VIRTLET_ENABLED')) {
- salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'reclass.cluster_meta_set', ['kubernetes_virtlet_enabled', VIRTLET_ENABLED])
- }
- if (env.getEnvironment().containsKey('KUBE_NET_MANAGER_ENABLED')) {
- salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'reclass.cluster_meta_set', ['kubernetes_kube_network_manager_enabled', KUBE_NET_MANAGER_ENABLED])
- }
- }
-
// If k8s install with contrail network manager then contrail need to be install first
if (common.checkContains('STACK_INSTALL', 'contrail')) {
stage('Install Contrail for Kubernetes') {