Parametrize mcp_docker_registry host
Related-Bug: PROD-22480 (PROD:22480)
Change-Id: I36ad55a1960f6c8e025d9c967bbc7658927fc872
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 624e553..b1deafa 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -1,5 +1,6 @@
parameters:
_param:
+ mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
jenkins_deploy_jobs: []
heat_stack_zone_job_param:
type: string
@@ -180,7 +181,7 @@
TEST_TEMPEST_IMAGE:
type: string
description: "Tempest docker image"
- default: "docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest"
+ default: "${_param:mcp_docker_registry}/mirantis/oscore/rally-tempest"
TEST_TEMPEST_TARGET:
type: string
description: "Node to run tests"
diff --git a/jenkins/client/job/deploy/rollout.yml b/jenkins/client/job/deploy/rollout.yml
index 3b05fd6..25b088d 100644
--- a/jenkins/client/job/deploy/rollout.yml
+++ b/jenkins/client/job/deploy/rollout.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
jenkins:
client:
job:
@@ -56,7 +58,7 @@
TEST_TEMPEST_IMAGE:
type: string
description: "Tempest docker image"
- default: "docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest"
+ default: "${_param:mcp_docker_registry}/mirantis/oscore/rally-tempest"
TEST_TEMPEST_TARGET:
type: string
description: "Node to run tests"
diff --git a/jenkins/client/job/deploy/test.yml b/jenkins/client/job/deploy/test.yml
index acf6fa3..cad8ed4 100644
--- a/jenkins/client/job/deploy/test.yml
+++ b/jenkins/client/job/deploy/test.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
jenkins:
client:
job:
@@ -37,7 +39,7 @@
TEST_TEMPEST_IMAGE:
type: string
description: "Tempest docker image"
- default: "docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest"
+ default: "${_param:mcp_docker_registry}/mirantis/oscore/rally-tempest"
TEST_TEMPEST_TARGET:
type: string
description: "Node to run tests. use FQDN for ctl01 e.g. ctl01.deploy-heat-os_ha_contrail-17.bud-mk.local"
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml
index f209aa2..e7697a0 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
jenkins:
client:
job:
@@ -32,5 +34,5 @@
param:
KUBE_DOCKER_REGISTRY:
type: string
- default: 'docker-dev-local.docker.mirantis.net'
+ default: ${_param:mcp_docker_registry}
description: 'Docker registry for binaries and images'
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
index 0fdbbfe..99a3884 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
jenkins:
client:
job:
@@ -41,7 +43,7 @@
param:
KUBE_DOCKER_REGISTRY:
type: string
- default: 'docker-dev-local.docker.mirantis.net'
+ default: ${_param:mcp_docker_registry}
description: 'Docker registry for binaries and images'
CALICO_DOCKER_REGISTRY:
type: string
diff --git a/jenkins/client/job/test_pipelines.yml b/jenkins/client/job/test_pipelines.yml
index d18b281..c8eaab0 100644
--- a/jenkins/client/job/test_pipelines.yml
+++ b/jenkins/client/job/test_pipelines.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
jenkins:
client:
job_template:
@@ -48,7 +50,7 @@
default: "gerrit"
GRADLE_IMAGE:
type: string
- default: "docker-dev-local.docker.mirantis.net/mirantis/cicd/niaquinto_gradle"
+ default: "${_param:mcp_docker_registry}/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 112cb3d..57db539 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -2,6 +2,7 @@
_param:
jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
cvp_sanity_default_repo: "https://github.com/Mirantis/cvp-sanity-checks"
+ mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
jenkins:
client:
view:
@@ -37,7 +38,7 @@
description: Credentials to the Salt API
TEST_IMAGE:
type: string
- default: "docker-prod-local.artifactory.mirantis.com/mirantis/oss/qa-tools"
+ default: "${_param:mcp_docker_registry}/mirantis/oss/qa-tools"
description: Docker image to setup testing environment
TARGET_NODE:
type: string
diff --git a/jenkins/client/job/vnf-onboarding/init.yml b/jenkins/client/job/vnf-onboarding/init.yml
index 69b4f4d..60f9ce1 100644
--- a/jenkins/client/job/vnf-onboarding/init.yml
+++ b/jenkins/client/job/vnf-onboarding/init.yml
@@ -1,15 +1,15 @@
classes:
- system.jenkins.client.job.vnf-onboarding.deploy_cloudify
-
parameters:
_param:
cluster_public_protocol: https
+ mcp_docker_registry: 'docker-dev-local.docker.mirantis.net'
vnf_gerrit_credentials: "gerrit"
vnf_openstack_api_url: "${_param:cluster_public_protocol}://${_param:cluster_public_host}:5000/v2.0"
vnf_openstack_api_credentials: "test-openstack"
vnf_openstack_api_admin_credentials: "admin-openstack"
vnf_openstack_ssh_key_credentials: "openstack_key"
vnf_elastic_url: "${_param:stacklight_log_address}:${_param:cluster_elasticsearch_port}"
- vnf_docker_registry_path: "docker-dev-local.docker.mirantis.net/mirantis/vnf-onboarding"
+ vnf_docker_registry_path: "${_param:mcp_docker_registry}/mirantis/vnf-onboarding"
vnf_artifactory_url: "https://artifactory.mcp.mirantis.net/artifactory/vnf-onboarding-sandbox"
contrail_api_url: "http://127.0.0.1:8082"