Merge "Add neutron_enable_vlan_aware_vms option"
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index bc01e92..c8c6b64 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- docker_image_jenkins: tcpcloud/jenkins:2.71
+ docker_image_jenkins: tcpcloud/jenkins:2.73
jenkins_master_extra_opts: ""
jenkins_master_executors_num: 4
docker:
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index ebacf60..99f2492 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -126,3 +126,4 @@
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.lang.Object java.lang.String
- method java.io.File listFiles
- method java.lang.String concat java.lang.String
+ - method org.jenkinsci.plugins.workflow.steps.FlowInterruptedException getCauses
diff --git a/jenkins/client/job/debian/packages/extra.yml b/jenkins/client/job/debian/packages/extra.yml
index 7371d3b..c7df567 100644
--- a/jenkins/client/job/debian/packages/extra.yml
+++ b/jenkins/client/job/debian/packages/extra.yml
@@ -97,6 +97,10 @@
dist: trusty
build: jmx-exporter
branch: master
+ - package: python-bitstring
+ dist: trusty
+ build: pipeline
+ branch: debian/trusty
- package: librdkafka
dist: xenial
build: pipeline
diff --git a/jenkins/client/job/deploy/rollout.yml b/jenkins/client/job/deploy/rollout.yml
new file mode 100644
index 0000000..3f2f835
--- /dev/null
+++ b/jenkins/client/job/deploy/rollout.yml
@@ -0,0 +1,92 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ deploy_rollout_config_change:
+ name: deploy-rollout-config-change
+ type: workflow-scm
+ discard:
+ build:
+ keep_num: 20
+ concurrent: true
+ display_name: "Deploy - Rollout change"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: rollout-config-change.groovy
+ param:
+ TST_SALT_MASTER_CREDENTIALS:
+ type: string
+ TST_SALT_MASTER_URL:
+ type: string
+ PRD_SALT_MASTER_CREDENTIALS:
+ type: string
+ PRD_SALT_MASTER_URL:
+ type: string
+ MODEL_REPO_URL:
+ type: string
+ MODEL_REPO_CREDENTIALS:
+ type: string
+ default: "gerrit"
+ MODEL_REPO_SOURCE_BRANCH:
+ type: string
+ MODEL_REPO_TARGET_BRANCH:
+ type: string
+ TARGET_SERVERS:
+ type: string
+ TARGET_STATES:
+ type: string
+ TARGET_SUBSET_TEST:
+ type: string
+ TARGET_SUBSET_LIVE:
+ type: string
+ TARGET_BATCH_LIVE:
+ type: string
+ # test
+ TEST_SERVICE:
+ type: string
+ TEST_K8S_API_SERVER:
+ type: string
+ default: "http://127.0.0.1:8080"
+ TEST_K8S_CONFORMANCE_IMAGE:
+ type: string
+ default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.5.1-3_1482332392819"
+ TEST_TEMPEST_IMAGE:
+ type: string
+ description: "Tempest docker image"
+ default: "sandbox-docker-prod-local.docker.mirantis.net/mirantis/rally_tempest:0.1"
+ TEST_TEMPEST_TARGET:
+ type: string
+ description: "Node to run tests"
+ default: ""
+ TEST_DOCKER_INSTALL:
+ type: boolean
+ description: "Install docker on the target if true"
+ default: "true"
+ TEST_TEMPEST_PATTERN:
+ type: string
+ description: "Run tests matched to pattern only"
+ git_merge_branches:
+ name: git-merge-branches
+ type: workflow-scm
+ discard:
+ build:
+ keep_num: 20
+ concurrent: true
+ display_name: "Git - Merge branches"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: git-merge-branches-pipeline.groovy
+ param:
+ REPO_URL:
+ type: string
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ SOURCE_BRANCH:
+ type: string
+ TARGET_BRANCH:
+ type: string
diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index 99e230b..b6bab31 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -23,8 +23,8 @@
tags: "2.32"
dockerfile: "Dockerfile"
- name: jenkins
- branch: "2.71"
- tags: "2.71 latest"
+ branch: "2.73"
+ tags: "2.73 latest"
dockerfile: "Dockerfile"
- name: phpldapadmin
branch: "master"
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 7849adc..50d1cc8 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -161,6 +161,9 @@
NODE_TARGET:
type: string
default: ""
+ CLUSTER_NAME:
+ type: string
+ default: ""
DEFAULT_GIT_URL:
type: string
default: "${_param:jenkins_gerrit_url}/salt-models/{{name}}"
diff --git a/opencontrail/client/resource/virtual_router.yml b/opencontrail/client/resource/virtual_router.yml
index 0333c8f..c02f8e8 100644
--- a/opencontrail/client/resource/virtual_router.yml
+++ b/opencontrail/client/resource/virtual_router.yml
@@ -1,10 +1,12 @@
parameters:
_param:
contrail_compute_dpdk_enabled: False
+ contrail_client_virtual_router_type: hypervisor
opencontrail:
client:
virtual_router:
local_compute:
name: ${linux:system:name}
ip_address: ${_param:single_address}
- dpdk_enabled: ${_param:contrail_compute_dpdk_enabled}
\ No newline at end of file
+ dpdk_enabled: ${_param:contrail_compute_dpdk_enabled}
+ router_type: ${_param:contrail_client_virtual_router_type}