Merge "Fix indent in test_pipelines job"
diff --git a/bind/server/single.yml b/bind/server/single.yml
new file mode 100644
index 0000000..be34143
--- /dev/null
+++ b/bind/server/single.yml
@@ -0,0 +1,9 @@
+classes:
+ - service.bind.server.single
+parameters:
+ bind:
+ server:
+ enabled: true
+ recursion:
+ hosts:
+ - localhost
diff --git a/designate/server/backend/bind.yml b/designate/server/backend/bind.yml
new file mode 100644
index 0000000..2b40424
--- /dev/null
+++ b/designate/server/backend/bind.yml
@@ -0,0 +1,36 @@
+parameters:
+ designate:
+ server:
+ backend:
+ bind9:
+ rndc_key: "${_param:designate_bind9_rndc_key}"
+ bind:
+ server:
+ key:
+ designate:
+ secret: "${_param:designate_bind9_rndc_key}"
+ algorithm: hmac-sha512
+ allow_new_zones: true
+ query: true
+ control:
+ local:
+ enabled: true
+ bind:
+ address: 127.0.0.1
+ port: 953
+ allow:
+ - 127.0.0.1
+ - ${_param:single_address}
+ keys:
+ - designate
+ client:
+ enabled: true
+ option:
+ default:
+ server: 127.0.0.1
+ port: 953
+ key: designate
+ key:
+ designate:
+ secret: "${_param:designate_bind9_rndc_key}"
+ algorithm: hmac-sha512
diff --git a/designate/server/backend/bind9.yml b/designate/server/backend/bind9.yml
deleted file mode 100644
index fa15ae1..0000000
--- a/designate/server/backend/bind9.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-parameters:
- designate:
- server:
- backend:
- bind9:
- rndc_key: ${_param:designate_bind9_rndc_key}
-
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index 0b0ab07..f411c39 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -25,6 +25,7 @@
docker-workflow: {}
extended-choice-parameter: {}
gerrit-trigger: {}
+ git: {}
heavy-job: {}
matrix-auth: {}
monitoring: {}
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 7dd70ea..5cbbe7d 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -137,6 +137,8 @@
dist: trusty
- name: pritunl
dist: trusty
+ - name: prometheus
+ dist: trusty
- name: python
dist: trusty
- name: rabbitmq
@@ -167,6 +169,8 @@
dist: trusty
- name: taiga
dist: trusty
+ - name: telegraf
+ dist: trusty
- name: varnish
dist: trusty
- name: zookeeper
@@ -303,6 +307,8 @@
dist: xenial
- name: pritunl
dist: xenial
+ - name: prometheus
+ dist: xenial
- name: python
dist: xenial
- name: rabbitmq
@@ -333,6 +339,8 @@
dist: xenial
- name: taiga
dist: xenial
+ - name: telegraf
+ dist: xenial
- name: varnish
dist: xenial
- name: zookeeper
diff --git a/jenkins/client/job/deploy/update/saltenv.yml b/jenkins/client/job/deploy/update/saltenv.yml
index 5b55f82..0303aea 100644
--- a/jenkins/client/job/deploy/update/saltenv.yml
+++ b/jenkins/client/job/deploy/update/saltenv.yml
@@ -11,7 +11,7 @@
update_salt_env:
name: deploy-update-{{name}}
jobs:
- - name: ${_param:jenkins_salt_env_name}
+ - name: ${_param:jenkins_salt_model_name}
salt_url: "${_param:jenkins_salt_api_url}"
salt_credentials: salt
template:
diff --git a/jenkins/client/job/git-mirrors/downstream/init.yml b/jenkins/client/job/git-mirrors/downstream/init.yml
index 9333e6a..0ddc0ce 100644
--- a/jenkins/client/job/git-mirrors/downstream/init.yml
+++ b/jenkins/client/job/git-mirrors/downstream/init.yml
@@ -1,6 +1,7 @@
parameters:
_param:
jenkins_git_mirror_downstream_jobs: []
+ jenkins_pollscm_spec: "H/60 * * * *"
jenkins:
client:
job_template:
@@ -21,18 +22,8 @@
credentials: "gerrit"
script: git-mirror-pipeline.groovy
trigger:
- gerrit:
- project:
- "{{downstream}}":
- branches:
- - master
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- ref:
- - updated
+ pollscm:
+ spec: ${_param:jenkins_pollscm_spec}
param:
SOURCE_URL:
type: string
diff --git a/jenkins/client/job/git-mirrors/downstream/pipelines.yml b/jenkins/client/job/git-mirrors/downstream/pipelines.yml
index 8f7858e..7bf366c 100644
--- a/jenkins/client/job/git-mirrors/downstream/pipelines.yml
+++ b/jenkins/client/job/git-mirrors/downstream/pipelines.yml
@@ -4,10 +4,10 @@
_param:
jenkins_git_mirror_downstream_jobs:
- name: pipeline-library
- downstream: mcp-ci/pipeline-library.git
- upstream: "git@github.com:Mirantis/pipeline-library.git"
+ downstream: mcp-ci/pipeline-library
+ upstream: "https://github.com/Mirantis/pipeline-library"
branches: master
- name: mk-pipelines
- downstream: mk/mk-pipelines.git
- upstream: "git@github.com:Mirantis/mk-pipelines.git"
+ downstream: mk/mk-pipelines
+ upstream: "https://github.com/Mirantis/mk-pipelines"
branches: master
diff --git a/jenkins/client/job/git-mirrors/upstream/pipelines.yml b/jenkins/client/job/git-mirrors/upstream/pipelines.yml
index 35f7df1..20f7eb6 100644
--- a/jenkins/client/job/git-mirrors/upstream/pipelines.yml
+++ b/jenkins/client/job/git-mirrors/upstream/pipelines.yml
@@ -4,10 +4,10 @@
_param:
jenkins_git_mirror_upstream_jobs:
- name: pipeline-library
- downstream: mcp-ci/pipeline-library.git
+ downstream: mcp-ci/pipeline-library
upstream: "git@github.com:Mirantis/pipeline-library.git"
branches: master
- name: mk-pipelines
- downstream: mk/mk-pipelines.git
+ downstream: mk/mk-pipelines
upstream: "git@github.com:Mirantis/mk-pipelines.git"
branches: master
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index 69cb4e7..e994323 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -11,43 +11,43 @@
os: ubuntu
dist: trusty
branch: R3.0.3.x
- ppa: mirantis/opencontrail-3.0.3
+ ppa: mirantis-opencontrail/opencontrail-3.0.3
upload_source_package: false
- buildname: oc31
os: ubuntu
dist: trusty
branch: R3.1
- ppa: mirantis/opencontrail-3.1
+ ppa: mirantis-opencontrail/opencontrail-3.1
upload_source_package: true
- buildname: oc31
os: ubuntu
dist: xenial
branch: R3.1
- ppa: mirantis/opencontrail-3.1
+ ppa: mirantis-opencontrail/opencontrail-3.1
upload_source_package: true
- buildname: oc311
os: ubuntu
dist: trusty
branch: R3.1.1.x
- ppa: mirantis/opencontrail-3.1.1
+ ppa: mirantis-opencontrail/opencontrail-3.1.1
upload_source_package: true
- buildname: oc311
os: ubuntu
dist: xenial
branch: R3.1.1.x
- ppa: mirantis/opencontrail-3.1.1
+ ppa: mirantis-opencontrail/opencontrail-3.1.1
upload_source_package: true
- buildname: oc32
os: ubuntu
dist: trusty
branch: R3.2
- ppa: mirantis/opencontrail-3.2
+ ppa: mirantis-opencontrail/opencontrail-3.2
upload_source_package: true
- buildname: oc32
os: ubuntu
dist: xenial
branch: R3.2
- ppa: mirantis/opencontrail-3.2
+ ppa: mirantis-opencontrail/opencontrail-3.2
upload_source_package: true
template:
discard:
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index 0ea3d7b..207ae6b 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -82,6 +82,7 @@
- name: postfix
- name: postgresql
- name: pritunl
+ - name: prometheus
- name: python
- name: rabbitmq
- name: reclass
@@ -98,6 +99,7 @@
- name: supervisor
- name: swift
- name: taiga
+ - name: telegraf
- name: varnish
- name: zookeeper
template:
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 5d5206b..6988392 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -80,6 +80,7 @@
- name: postfix
- name: postgresql
- name: pritunl
+ - name: prometheus
- name: python
- name: rabbitmq
- name: reclass
@@ -96,6 +97,7 @@
- name: supervisor
- name: swift
- name: taiga
+ - name: telegraf
- name: varnish
- name: zookeeper
template:
diff --git a/jenkins/master/config.yml b/jenkins/master/config.yml
index bb1998c..adb0c7c 100644
--- a/jenkins/master/config.yml
+++ b/jenkins/master/config.yml
@@ -91,3 +91,5 @@
- method hudson.model.Item getName
- method java.util.Map remove java.lang.Object
- staticMethod java.lang.System getProperty java.lang.String
+ - staticMethod java.lang.Integer valueOf java.lang.String
+ - method java.util.List subList int int