Merge "Add Jenkins categorized vies"
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/opencontrail/build/test.yml b/jenkins/client/job/opencontrail/build/test.yml
index 8183c3d..d26e56e 100644
--- a/jenkins/client/job/opencontrail/build/test.yml
+++ b/jenkins/client/job/opencontrail/build/test.yml
@@ -36,7 +36,7 @@
artifact:
keep_num: 5
type: workflow-scm
- concurrent: false
+ concurrent: true
quiet_period: 120
scm:
type: git
@@ -64,3 +64,25 @@
ARCH:
type: string
default: "amd64"
+ trigger:
+ gerrit:
+ project:
+ contrail/contrail-controller:
+ branches:
+ - "{{branch}}"
+ contrail/contrail-vrouter:
+ branches:
+ - "{{branch}}"
+ event:
+ patchset:
+ - created:
+ excludeDrafts: false
+ excludeTrivialRebase: false
+ excludeNoCodeChange: false
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '(recheck|reverify)'
+ param:
+ TEST_MODELS:
+ type: string
+ default: "{{clusters}}"
\ No newline at end of file
diff --git a/salt/master/formula/git/oss.yml b/salt/master/formula/git/oss.yml
index 9354935..3c555ee 100644
--- a/salt/master/formula/git/oss.yml
+++ b/salt/master/formula/git/oss.yml
@@ -7,7 +7,10 @@
environment:
dev:
formula:
- devops-portal:
+ devops_portal:
+ module:
+ devops_utils.py:
+ enabled: true
source: git
address: '${_param:salt_master_oss_repository}/salt-formula-devops-portal.git'
revision: ${_param:salt_master_oss_revision}
diff --git a/salt/master/formula/pkg/oss.yml b/salt/master/formula/pkg/oss.yml
new file mode 100644
index 0000000..1c0e90a
--- /dev/null
+++ b/salt/master/formula/pkg/oss.yml
@@ -0,0 +1,9 @@
+parameters:
+ salt:
+ master:
+ environment:
+ prd:
+ formula:
+ devops_portal:
+ source: pkg
+ name: salt-formula-devops-portal