Merge "remove oc test for xenial"
diff --git a/docker/swarm/service/jenkins.yml b/docker/swarm/service/jenkins.yml
index 16dee71..b2fdeb6 100644
--- a/docker/swarm/service/jenkins.yml
+++ b/docker/swarm/service/jenkins.yml
@@ -6,7 +6,7 @@
service:
jenkins:
environment:
- JAVA_OPTS: "-Djenkins.install.runSetupWizard=false -Dhudson.footerURL=https://www.mirantis.com"
+ JAVA_OPTS: "-Djenkins.install.runSetupWizard=false -Dhudson.DNSMultiCast.disabled=true -Dhudson.udp=-1 -Dhudson.footerURL=https://www.mirantis.com"
JENKINS_NUM_EXECUTORS: 4
restart:
condition: any
diff --git a/gerrit/client/init.yml b/gerrit/client/init.yml
index 7dd6c77..ed4b1d6 100644
--- a/gerrit/client/init.yml
+++ b/gerrit/client/init.yml
@@ -1,9 +1,12 @@
classes:
- service.gerrit.client
parameters:
+ _param:
+ gerrit_try_login: true
gerrit:
client:
enabled: True
+ try_login: ${_param:gerrit_try_login}
source:
engine: pip
dir:
diff --git a/jenkins/client/job/aptly.yml b/jenkins/client/job/aptly.yml
index d5d8fcd..c6a5755 100644
--- a/jenkins/client/job/aptly.yml
+++ b/jenkins/client/job/aptly.yml
@@ -1,6 +1,16 @@
parameters:
jenkins:
client:
+ view:
+ Aptly:
+ enabled: true
+ type: CategorizedJobsView
+ include_regex: "aptly-.*"
+ categories:
+ - group_regex: "aptly-.*-nightly-testing"
+ naming_rule: "Nightly -> Testing"
+ - group_regex: "aptly-.*-testing-stable"
+ naming_rule: "Testing -> Stable"
job_template:
aptly:
name: aptly-{{operation}}-{{dist}}-{{source}}-{{target}}
diff --git a/jenkins/client/job/debian/init.yml b/jenkins/client/job/debian/init.yml
index d0b40a0..f24cccc 100644
--- a/jenkins/client/job/debian/init.yml
+++ b/jenkins/client/job/debian/init.yml
@@ -1,2 +1,15 @@
classes:
- system.jenkins.client.job.debian.packages
+parameters:
+ jenkins:
+ client:
+ view:
+ Debian:
+ enabled: true
+ type: CategorizedJobsView
+ include_regex: "build-debian-(?!salt-formula-).*"
+ categories:
+ - group_regex: ".*-ubuntu-trusty"
+ naming_rule: "Ubuntu Trusty"
+ - group_regex: ".*-ubuntu-xenial"
+ naming_rule: "Ubuntu Xenial"
diff --git a/jenkins/client/job/deploy/init.yml b/jenkins/client/job/deploy/init.yml
index 102fe73..f25086d 100644
--- a/jenkins/client/job/deploy/init.yml
+++ b/jenkins/client/job/deploy/init.yml
@@ -2,3 +2,20 @@
- system.jenkins.client.job.deploy.lab
- system.jenkins.client.job.deploy.update
- system.jenkins.client.job.deploy.openstack
+parameters:
+ jenkins:
+ client:
+ view:
+ Deploy:
+ enabled: true
+ type: CategorizedJobsView
+ include_regex: "deploy-.*"
+ categories:
+ - group_regex: "deploy-(heat|physical)-"
+ naming_rule: ""
+ - group_regex: "deploy-update-*"
+ naming_rule: "support"
+ - group_regex: "(mcp)[0-9]+"
+ naming_rule: ""
+ - group_regex: "(mk)[0-9]+"
+ naming_rule: ""
diff --git a/jenkins/client/job/opencontrail/init.yml b/jenkins/client/job/opencontrail/init.yml
index 72ee4fe..b41a357 100644
--- a/jenkins/client/job/opencontrail/init.yml
+++ b/jenkins/client/job/opencontrail/init.yml
@@ -7,3 +7,21 @@
contrail_kubernetes_branches: "master,release-1.2"
contrail_dpdk_extra_branches: "mitaka,kilo,liberty-multiqueue"
contrail_ceilometer_plugin_branches: "master"
+ jenkins:
+ client:
+ view:
+ Opencontrail:
+ enabled: true
+ type: CategorizedJobsView
+ include_regex: "build-opencontrail-.*"
+ categories:
+ - group_regex: "build-opencontrail-dpdk-extra-.*"
+ naming_rule: "DPDK Extras"
+ - group_regex: "build-opencontrail-oc303-.*"
+ naming_rule: "R3.0.3.x"
+ - group_regex: "build-opencontrail-oc31-.*"
+ naming_rule: "R3.1"
+ - group_regex: "build-opencontrail-oc311-.*"
+ naming_rule: "R3.1.1.x"
+ - group_regex: "build-opencontrail-oc32-.*"
+ naming_rule: "R3.2"
diff --git a/jenkins/client/job/salt-formulas/init.yml b/jenkins/client/job/salt-formulas/init.yml
index c498032..8c8c2e2 100644
--- a/jenkins/client/job/salt-formulas/init.yml
+++ b/jenkins/client/job/salt-formulas/init.yml
@@ -2,3 +2,16 @@
- system.jenkins.client.job.salt-formulas.git-mirrors
- system.jenkins.client.job.salt-formulas.tests
- system.jenkins.client.job.salt-formulas.release
+parameters:
+ jenkins:
+ client:
+ view:
+ "Salt formulas":
+ enabled: true
+ type: CategorizedJobsView
+ include_regex: "build-debian-salt-formula-.*"
+ categories:
+ - group_regex: ".*-ubuntu-trusty"
+ naming_rule: "Ubuntu Trusty"
+ - group_regex: ".*-ubuntu-xenial"
+ naming_rule: "Ubuntu Xenial"
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index 60cfb14..a943b3b 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -2,11 +2,11 @@
jenkins:
client:
job_template:
- generate_reclass_clusters:
- name: generate_reclass_cluster_{{cookiecutter_template}}
+ generate-salt-model:
+ name: generate-salt-model-{{cookiecutter_template}}
param:
cookiecutter_template:
- - separated_products
+ - separated-products
template:
type: workflow-scm
concurrent: true
@@ -48,7 +48,7 @@
type: string
RECLASS_MODEL_URL:
type: string
- default: "jenkins-mk@${_param:jenkins_gerrit_url}/salt-models/training.git"
+ default: "${_param:jenkins_gerrit_url}/salt-models/training.git"
RECLASS_MODEL_CREDENTIALS:
type: string
default: gerrit