Add parameters to run k8s conformance during upgrades
- Also change cmp target
Related-PROD: PROD-21701
Change-Id: I37ace3b4c84d45bb27d5b3602176ff58bc6786b3
diff --git a/jenkins/client/job/deploy/update/kubernetes_update.yml b/jenkins/client/job/deploy/update/kubernetes_update.yml
index 11279ed..4100384 100644
--- a/jenkins/client/job/deploy/update/kubernetes_update.yml
+++ b/jenkins/client/job/deploy/update/kubernetes_update.yml
@@ -26,11 +26,11 @@
param:
KUBERNETES_HYPERKUBE_IMAGE:
type: string
- default: "${_param:kubernetes_hyperkube_repo}/hyperkube-amd64:v1.10.4-4"
+ default: "${_param:kubernetes_hyperkube_repo}/hyperkube-amd64:v1.11.3-2"
description: "Versioned image to update control plane from. Should be null if update rolling via reclass-system level"
KUBERNETES_PAUSE_IMAGE:
type: string
- default: "${_param:kubernetes_hyperkube_repo}/pause-amd64:v1.10.4-4"
+ default: "${_param:kubernetes_hyperkube_repo}/pause-amd64:v1.11.3-2"
description: "Versioned pause image to use in deployments. Should be null if update rolling via reclass-system level"
SALT_MASTER_URL:
type: string
@@ -60,5 +60,21 @@
description: "Salt targeted kubernetes CTL nodes (ex. I@kubernetes:master). Kubernetes control plane"
CMP_TARGET:
type: string
- default: "cmp* and I@kubernetes:pool"
+ default: "I@kubernetes:pool and not I@kubernetes:master"
description: "Salt targeted compute nodes (ex. 'cmp* and I@kubernetes:pool') Kubernetes computes"
+ CONFORMANCE_RUN_AFTER:
+ type: boolean
+ default: "false"
+ description: "Run conformance tests after upgrade"
+ CONFORMANCE_RUN_BEFORE:
+ type: boolean
+ default: "false"
+ description: "Run conformance tests before upgrade"
+ TEST_K8S_API_SERVER:
+ type: string
+ default: "http://127.0.0.1:8080"
+ description: "Local kubernetes apiserver variable for conformance tests"
+ ARTIFACTORY_URL:
+ type: string
+ default: "docker-prod-local.docker.mirantis.com"
+ description: "Artifactory URL where docker images located. Needed to correctly fetch conformance images."