Merge "Refactor apt_mirantis/saltstack"
diff --git a/jenkins/client/job/deploy/update/init.yml b/jenkins/client/job/deploy/update/init.yml
index fb1f5cf..35a2912 100644
--- a/jenkins/client/job/deploy/update/init.yml
+++ b/jenkins/client/job/deploy/update/init.yml
@@ -15,3 +15,4 @@
- system.jenkins.client.job.deploy.update.restore_zookeeper
- system.jenkins.client.job.deploy.update.virt_snapshot
- system.jenkins.client.job.deploy.update.cloud_update
+ - system.jenkins.client.job.deploy.update.kubernetes_update
diff --git a/jenkins/client/job/deploy/update/kubernetes_update.yml b/jenkins/client/job/deploy/update/kubernetes_update.yml
index 09f0166..9fb23f9 100644
--- a/jenkins/client/job/deploy/update/kubernetes_update.yml
+++ b/jenkins/client/job/deploy/update/kubernetes_update.yml
@@ -4,7 +4,7 @@
parameters:
_param:
jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
- hyperkube_repo: "${_param:kubernetes_hyperkube_repo}"
+ kubernetes_hyperkube_repo: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes
jenkins:
client:
job:
@@ -21,11 +21,11 @@
param:
KUBERNETES_HYPERKUBE_IMAGE:
type: string
- default: "${_param:hyperkube_repo}/hyperkube-amd64:v1.10.4-4"
+ default: "${_param:kubernetes_hyperkube_repo}/hyperkube-amd64:v1.10.4-4"
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:hyperkube_repo}/pause-amd64:v1.10.4-4"
+ default: "${_param:kubernetes_hyperkube_repo}/pause-amd64:v1.10.4-4"
description: "Versioned pause image to use in deployments. Should be null if update rolling via reclass-system level"
SALT_MASTER_URL:
type: string
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index a2b000a..d8e9f22 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -26,6 +26,9 @@
- name: avinetworks
branches: ${_param:salt_formulas_branches}
notification_recipients: ${_param:salt_formulas_notification_recipients}
+ - name: auditd
+ branches: ${_param:salt_formulas_branches}
+ notification_recipients: ${_param:salt_formulas_notification_recipients}
- name: backupninja
branches: ${_param:salt_formulas_branches}
notification_recipients: ${_param:salt_formulas_notification_recipients}
diff --git a/jenkins/client/job/test_pipelines.yml b/jenkins/client/job/test_pipelines.yml
index c9a2442..2b0fabe 100644
--- a/jenkins/client/job/test_pipelines.yml
+++ b/jenkins/client/job/test_pipelines.yml
@@ -46,7 +46,7 @@
default: "gerrit"
GRADLE_IMAGE:
type: string
- default: "niaquinto/gradle"
+ default: "docker-dev-local.docker.mirantis.net/mirantis/cicd/niaquinto_gradle"
GRADLE_CMD:
type: string
default: "check --info"
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 777941b..32b0c0f 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -1,6 +1,7 @@
parameters:
_param:
jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+ cvp_sanity_default_repo: "https://github.com/Mirantis/cvp-sanity-checks"
jenkins:
client:
view:
@@ -162,7 +163,7 @@
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
branch: "${_param:jenkins_pipelines_branch}"
credentials: "gerrit"
- script: cvp-sanity.groovy
+ script: cvp-runner.groovy
param:
SALT_MASTER_URL:
type: string
@@ -171,17 +172,17 @@
SALT_MASTER_CREDENTIALS:
type: string
default: "salt"
- SANITY_TESTS_REPO:
+ TESTS_REPO:
type: string
- default: "https://github.com/Mirantis/cvp-sanity-checks"
+ default: "${_param:cvp_sanity_default_repo}"
description: Url for cvp-sanity-checks
- SANITY_TESTS_SETTINGS:
+ TESTS_SETTINGS:
type: string
default: ""
description: e.g. skipped_nodes=nal01.local.com,ntw01.local.com
- SANITY_TESTS_SET:
+ TESTS_SET:
type: string
- default: ""
+ default: "cvp-sanity-check/cvp_checks/tests/"
description: Leave empty for full run or choose a file, e.g. test_mtu.py
PROXY:
type: string