Merge "Add akurenyshev to networking team"
diff --git a/jenkins/client/job/git-mirrors/2way.yml b/jenkins/client/job/git-mirrors/2way.yml
index 71d8f9a..2fe2fab 100644
--- a/jenkins/client/job/git-mirrors/2way.yml
+++ b/jenkins/client/job/git-mirrors/2way.yml
@@ -11,7 +11,7 @@
- name: mcp-common-scripts
source: mcp/mcp-common-scripts
target: Mirantis/mcp-common-scripts
- branches: "master,release/2018.8.1"
+ branches: "master,release/2018.8.1,release/2018.11.0"
- name: mcp-local-repo-model
source: mcp/mcp-local-repo-model
target: Mirantis/mcp-local-repo-model
diff --git a/jenkins/client/job/git-mirrors/downstream/pipelines.yml b/jenkins/client/job/git-mirrors/downstream/pipelines.yml
index 17611cb..58c23b0 100644
--- a/jenkins/client/job/git-mirrors/downstream/pipelines.yml
+++ b/jenkins/client/job/git-mirrors/downstream/pipelines.yml
@@ -8,8 +8,8 @@
- name: pipeline-library
downstream: mcp-ci/pipeline-library
upstream: "${_param:gerrit_pipeline_library_repo}"
- branches: "master,release/2018.8.1"
+ branches: "master,release/2018.8.1,release/2018.11.0"
- name: mk-pipelines
downstream: mk/mk-pipelines
upstream: "${_param:gerrit_mk_pipelines_repo}"
- branches: "master,release/2018.8.1"
+ branches: "master,release/2018.8.1,release/2018.11.0"
diff --git a/jenkins/client/job/git-mirrors/upstream/pipelines.yml b/jenkins/client/job/git-mirrors/upstream/pipelines.yml
index 9e82f80..4fc3b8f 100644
--- a/jenkins/client/job/git-mirrors/upstream/pipelines.yml
+++ b/jenkins/client/job/git-mirrors/upstream/pipelines.yml
@@ -6,8 +6,8 @@
- name: pipeline-library
downstream: mcp-ci/pipeline-library
upstream: "git@github.com:Mirantis/pipeline-library.git"
- branches: master,release/2018.8.1
+ branches: "master,release/2018.8.1,release/2018.11.0"
- name: mk-pipelines
downstream: mk/mk-pipelines
upstream: "git@github.com:Mirantis/mk-pipelines.git"
- branches: master,release/2018.8.1
+ branches: "master,release/2018.8.1,release/2018.11.0"
diff --git a/jenkins/client/job/git-mirrors/upstream/templates.yml b/jenkins/client/job/git-mirrors/upstream/templates.yml
index a386ba4..c5a371f 100644
--- a/jenkins/client/job/git-mirrors/upstream/templates.yml
+++ b/jenkins/client/job/git-mirrors/upstream/templates.yml
@@ -6,7 +6,7 @@
- name: cookiecutter-templates
downstream: mk/cookiecutter-templates
upstream: "git@github.com:Mirantis/mk2x-cookiecutter-reclass-model"
- branches: master,mcp10,release/2018.8.1
+ branches: "master,mcp10,release/2018.8.1,release/2018.11.0"
- name: heat-fragments
downstream: mk/heat-fragments
upstream: "git@github.com:Mirantis/heat-fragments"
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index f2efc67..152e951 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -456,7 +456,7 @@
default: "gerrit"
BRANCHES:
type: string
- default: "master,release/2018.8.1"
+ default: "master,release/2018.8.1,release/2018.11.0"
git-mirror-2way-salt-formulas-cookiecutter:
description: ${_param:job_description_2way}
discard:
diff --git a/jenkins/client/job/security/openscap.yml b/jenkins/client/job/security/openscap.yml
index 7bedf61..b98e497 100644
--- a/jenkins/client/job/security/openscap.yml
+++ b/jenkins/client/job/security/openscap.yml
@@ -21,6 +21,12 @@
credentials: "gerrit"
script: test-openscap-pipeline.groovy
param:
+ OPENSCAP_TEST_TYPE:
+ type: choice
+ description: "Type of tests to run"
+ choices:
+ - xccdf
+ - oval
DASHBOARD_API_URL:
type: string
default: ""
diff --git a/opencontrail/compute/cluster.yml b/opencontrail/compute/cluster.yml
index 5e92709..7cdcdf6 100644
--- a/opencontrail/compute/cluster.yml
+++ b/opencontrail/compute/cluster.yml
@@ -33,6 +33,3 @@
mask: ${_param:opencontrail_compute_iface_mask}
dns: ${_param:opencontrail_compute_dns}
mtu: 9000
- nova:
- compute:
- networking: contrail
diff --git a/opencontrail/compute/cluster4_0.yml b/opencontrail/compute/cluster4_0.yml
index 8c16c70..425f897 100644
--- a/opencontrail/compute/cluster4_0.yml
+++ b/opencontrail/compute/cluster4_0.yml
@@ -48,6 +48,3 @@
mask: ${_param:opencontrail_compute_iface_mask}
dns: ${_param:opencontrail_compute_dns}
mtu: 9000
- nova:
- compute:
- networking: contrail
diff --git a/opencontrail/compute/single.yml b/opencontrail/compute/single.yml
index d3caa45..65426c8 100644
--- a/opencontrail/compute/single.yml
+++ b/opencontrail/compute/single.yml
@@ -30,7 +30,6 @@
mtu: 9000
nova:
compute:
- networking: contrail
network:
engine: keystone
host: ${_param:control_address}
diff --git a/opencontrail/compute/single4_0.yml b/opencontrail/compute/single4_0.yml
index bd77c05..b48d1d0 100644
--- a/opencontrail/compute/single4_0.yml
+++ b/opencontrail/compute/single4_0.yml
@@ -38,7 +38,4 @@
mask: ${_param:opencontrail_compute_iface_mask}
dns: ${_param:opencontrail_compute_dns}
mtu: 9000
- nova:
- compute:
- networking: contrail