Update vnf-onboarding jobs with latest params
Add mirroring for vnf-onboarding repos as well.
Fix-PROD: PROD-18602
Change-Id: I820818423e25d4592bf12a09d5b6e1566a79caa6
diff --git a/jenkins/client/job/vnf-onboarding/init.yml b/jenkins/client/job/vnf-onboarding/init.yml
index 19ba3f6..0e0a847 100644
--- a/jenkins/client/job/vnf-onboarding/init.yml
+++ b/jenkins/client/job/vnf-onboarding/init.yml
@@ -11,3 +11,5 @@
vnf_openstack_api_credentials: "test-openstack"
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_artifactory_url: "https://artifactory.mcp.mirantis.net/artifactory/vnf-onboarding-sandbox"
+ contrail_api_url: "http://127.0.0.1:8082"
diff --git a/jenkins/client/job/vnf-onboarding/test_avi_loadbalancer.yml b/jenkins/client/job/vnf-onboarding/test_avi_loadbalancer.yml
index f30b2b7..2bc206b 100644
--- a/jenkins/client/job/vnf-onboarding/test_avi_loadbalancer.yml
+++ b/jenkins/client/job/vnf-onboarding/test_avi_loadbalancer.yml
@@ -73,9 +73,40 @@
NFV_PLATFORM_REPO_CREDENTIALS:
type: string
default: "${_param:vnf_gerrit_credentials}"
+ CONTRAIL_ENABLED:
+ type: boolean
+ default: false
+ CONTRAIL_API_URL:
+ type: string
+ default: "${_param:contrail_api_url}"
CI_OPTIONS:
type: string
default: "CFY_AGENT_NET=cfm-net CFY_AGENT_FLAVOR=cfy.agent CFY_AGENT_IMAGE=ubuntu1 CFY_AGENT_USER=cfyuser CFY_SG=cfm-sg CFY_SSH_KEY_ID=openstack_key"
+ VNF_ARTIFACTORY_URL:
+ type: string
+ default: "${_param:vnf_artifactory_url}"
+ VNF_ARTIFACTORY_PLUGINS_DIR:
+ type: string
+ default: "${_param:vnf_artifactory_url}/cloudify/plugins/"
+ VNF_DOCKER_REGISTRY_PATH:
+ type: string
+ default: "${_param:vnf_docker_registry_path}"
+ VNF_DOCKER_CLI_TAG:
+ type: string
+ default: "latest"
+ VNF_DOCKER_SCRUN_TAG:
+ type: string
+ default: "latest"
+ VNF_DOCKER_AVICFG_TAG:
+ type: string
+ default: "latest"
+ VNF_PLUGINS:
+ type: string
+ description: "Plugins to fetch from artifactory and install during build package step"
+ default: "vnf_onboarding_tools-0.1-py27-none-linux_x86_64_Ubuntu_xenial"
VNF_OPTIONS:
type: string
default: "AVI_VERSION=17.2.3 AVI_USERNAME=admin AVI_PASSWORD=Swordfish1234 AVI_IMAGE_PASSWORD=58NFaGDJm(PJH0G AVI_OS_FLAVOR=avi_ctrl.small AVI_OS_IMAGE=avi-control-17.2.3"
+ VNF_DOCKER_CLI_PLATFORM:
+ type: string
+ default: "ubuntu"
diff --git a/jenkins/client/job/vnf-onboarding/test_nginx_vnf.yml b/jenkins/client/job/vnf-onboarding/test_nginx_vnf.yml
index 8a86363..2dc1a31 100644
--- a/jenkins/client/job/vnf-onboarding/test_nginx_vnf.yml
+++ b/jenkins/client/job/vnf-onboarding/test_nginx_vnf.yml
@@ -74,9 +74,37 @@
NFV_PLATFORM_REPO_CREDENTIALS:
type: string
default: "${_param:vnf_gerrit_credentials}"
+ CONTRAIL_ENABLED:
+ type: boolean
+ default: false
+ CONTRAIL_API_URL:
+ type: string
+ default: "${_param:contrail_api_url}"
CI_OPTIONS:
type: string
default: "CFY_AGENT_NET=cfm-net CFY_AGENT_FLAVOR=cfy.agent CFY_AGENT_IMAGE=ubuntu1 CFY_AGENT_USER=cfyuser CFY_SG=cfm-sg CFY_SSH_KEY_ID=openstack_key"
+ VNF_ARTIFACTORY_URL:
+ type: string
+ default: "${_param:vnf_artifactory_url}"
+ VNF_ARTIFACTORY_PLUGINS_DIR:
+ type: string
+ default: "${_param:vnf_artifactory_url}/cloudify/plugins/"
+ VNF_DOCKER_REGISTRY_PATH:
+ type: string
+ default: "${_param:vnf_docker_registry_path}"
+ VNF_DOCKER_CLI_TAG:
+ type: string
+ default: "latest"
+ VNF_DOCKER_SCRUN_TAG:
+ type: string
+ default: "latest"
+ VNF_PLUGINS:
+ type: string
+ description: "Plugins to fetch from artifactory and install during build package step"
+ default: "vnf_onboarding_tools-0.1-py27-none-linux_x86_64_Ubuntu_xenial"
VNF_OPTIONS:
type: string
default: ""
+ VNF_DOCKER_CLI_PLATFORM:
+ type: string
+ default: "ubuntu"