Merge "Add quiet period to gating jobs"
diff --git a/aodh/server/cluster.yml b/aodh/server/cluster.yml
index b3fb4fb..4743111 100644
--- a/aodh/server/cluster.yml
+++ b/aodh/server/cluster.yml
@@ -10,6 +10,7 @@
ttl: 86400
debug: false
verbose: true
+ region: ${_param:openstack_region}
database:
engine: "mysql+pymysql"
host: ${_param:openstack_database_address}
@@ -36,4 +37,4 @@
members:
- host: ${_param:openstack_message_queue_node01_address}
- host: ${_param:openstack_message_queue_node02_address}
- - host: ${_param:openstack_message_queue_node03_address}
\ No newline at end of file
+ - host: ${_param:openstack_message_queue_node03_address}
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index bf46803..d947687 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -92,3 +92,5 @@
- method java.util.stream.Stream collect java.util.stream.Collector
- staticMethod java.util.regex.Pattern compile java.lang.String
- method java.util.regex.Matcher find
+ - method hudson.model.Run getId
+ - method java.util.regex.MatchResult groupCount
diff --git a/jenkins/client/job/docker.yml b/jenkins/client/job/docker.yml
new file mode 100644
index 0000000..220176c
--- /dev/null
+++ b/jenkins/client/job/docker.yml
@@ -0,0 +1,65 @@
+parameters:
+ jenkins:
+ client:
+ job_template:
+ docker-build-image:
+ name: docker-build-image-{{name}}-{{branch}}
+ jobs:
+ - name: gerrit
+ branch: "2.12.7"
+ tags: "2.12.7"
+ dockerfile: "Dockerfile"
+ - name: gerrit
+ branch: "2.13.6"
+ tags: "2.13.6 latest"
+ dockerfile: "Dockerfile"
+ - name: jenkins
+ branch: "2.32.3"
+ tags: "2.32"
+ dockerfile: "Dockerfile"
+ - name: jenkins
+ branch: "2.52"
+ tags: "2.52 latest"
+ dockerfile: "Dockerfile"
+ - name: phpldapadmin
+ branch: "master"
+ tags: "0.16.2 latest"
+ dockerfile: "image/Dockerfile"
+ template:
+ discard:
+ build:
+ keep_num: 5
+ artifact:
+ keep_num: 5
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: docker-build-image-pipeline.groovy
+ param:
+ IMAGE_NAME:
+ type: string
+ default: "tcpcloud/{{name}}"
+ IMAGE_GIT_URL:
+ type: string
+ default: ${_param:jenkins_gerrit_url}/mk/docker-{{name}}"
+ IMAGE_BRANCH:
+ type: string
+ default: "{{branch}}"
+ IMAGE_CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ IMAGE_TAGS:
+ type: string
+ default: "{{tags}}"
+ DOCKERFILE_PATH:
+ type: string
+ default: "{{dockerfile}}"
+ REGISTRY_URL:
+ type: string
+ default: ""
+ REGISTRY_CREDENTIALS_ID:
+ type: string
+ default: "dockerhub"
\ No newline at end of file
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index 7516354..7a2698c 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -84,6 +84,10 @@
type: boolean
default: 'false'
description: "Don't cleanup on failure"
+ DEBUG_DPDK:
+ type: boolean
+ default: 'false'
+ description: "CONFIG_RTE_LIBRTE_ETHDEV_DEBUG enabled or disabled"
OS:
type: string
default: "{{os}}"
diff --git a/linux/system/repo/mcp/contrail.yml b/linux/system/repo/mcp/contrail.yml
index 9f65ee3..9054f18 100644
--- a/linux/system/repo/mcp/contrail.yml
+++ b/linux/system/repo/mcp/contrail.yml
@@ -9,3 +9,7 @@
source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:apt_mk_version} ${_param:openstack_version} ${_param:linux_repo_contrail_component} extra"
architectures: amd64
key_url: "http://apt-mk.mirantis.com/public.gpg"
+ pin:
+ - pin: 'release a=${_param:openstack_version}-holdback'
+ priority: 1100
+ package: '*'
\ No newline at end of file
diff --git a/linux/system/repo/mcp/extra.yml b/linux/system/repo/mcp/extra.yml
index d8977f4..49e4532 100644
--- a/linux/system/repo/mcp/extra.yml
+++ b/linux/system/repo/mcp/extra.yml
@@ -9,3 +9,7 @@
architectures: amd64
key_url: "http://apt-mk.mirantis.com/public.gpg"
clean_file: true
+ pin:
+ - pin: 'release a=${_param:openstack_version}-holdback'
+ priority: 1100
+ package: '*'
diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml
index 67c9cad..d829c94 100644
--- a/linux/system/repo/mcp/openstack.yml
+++ b/linux/system/repo/mcp/openstack.yml
@@ -9,24 +9,47 @@
source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version} main"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ pin:
+ - pin: 'release a=${_param:openstack_version}'
+ priority: 1050
+ package: '*'
mirantis_openstack_hotfix:
source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-hotfix main"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ pin:
+ - pin: 'release a=${_param:openstack_version}-hotfix'
+ priority: 1050
+ package: '*'
mirantis_openstack_security:
source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-security main"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ pin:
+ - pin: 'release a=${_param:openstack_version}-security'
+ priority: 1050
+ package: '*'
mirantis_openstack_updates:
source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-updates main"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ pin:
+ - pin: 'release a=${_param:openstack_version}-uptades'
+ priority: 1050
+ package: '*'
mirantis_openstack_holdback:
source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-holdback main"
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ pin:
+ - pin: 'release a=${_param:openstack_version}-holdback'
+ priority: 1050
+ package: '*'
mk_openstack:
source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:apt_mk_version} ${_param:openstack_version}"
architectures: amd64
key_url: "http://apt-mk.mirantis.com/public.gpg"
-
+ pin:
+ - pin: 'release a=${_param:apt_mk_version}'
+ priority: 1100
+ package: '*'
\ No newline at end of file
diff --git a/linux/system/repo/mcp/salt.yml b/linux/system/repo/mcp/salt.yml
index 1941fe8..209943c 100644
--- a/linux/system/repo/mcp/salt.yml
+++ b/linux/system/repo/mcp/salt.yml
@@ -9,3 +9,7 @@
architectures: amd64
key_url: "http://apt-mk.mirantis.com/public.gpg"
clean_file: true
+ pin:
+ - pin: 'release a=${_param:openstack_version}-holdback'
+ priority: 1100
+ package: '*'
\ No newline at end of file
diff --git a/linux/system/repo/saltstack/trusty.yml b/linux/system/repo/saltstack/trusty.yml
index c20d4dc..68ce215 100644
--- a/linux/system/repo/saltstack/trusty.yml
+++ b/linux/system/repo/saltstack/trusty.yml
@@ -6,4 +6,5 @@
repo:
salt:
source: "deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/${_param:salt_version} trusty main"
+ architectures: amd64
key_url: "http://repo.saltstack.com/apt/ubuntu/14.04/amd64/${_param:salt_version}/SALTSTACK-GPG-KEY.pub"
\ No newline at end of file
diff --git a/linux/system/repo/saltstack/xenial.yml b/linux/system/repo/saltstack/xenial.yml
index 0c933b8..aca462a 100644
--- a/linux/system/repo/saltstack/xenial.yml
+++ b/linux/system/repo/saltstack/xenial.yml
@@ -6,4 +6,5 @@
repo:
salt:
source: "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/${_param:salt_version} xenial main"
+ architectures: amd64
key_url: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/${_param:salt_version}/SALTSTACK-GPG-KEY.pub"
\ No newline at end of file
diff --git a/linux/system/repo/ubuntu.yml b/linux/system/repo/ubuntu.yml
index b4137bd..d36bcc1 100644
--- a/linux/system/repo/ubuntu.yml
+++ b/linux/system/repo/ubuntu.yml
@@ -3,19 +3,19 @@
system:
repo:
ubuntu:
- source: "deb http://archive.ubuntu.com/ubuntu/ ${_param:linux_system_codename} main restricted universe"
+ source: "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ ${_param:linux_system_codename} main restricted universe"
architectures: amd64
default: true
key_id: 437D05B5
key_server: keyserver.ubuntu.com
ubuntu_updates:
- source: "deb http://archive.ubuntu.com/ubuntu/ ${_param:linux_system_codename}-updates main restricted universe"
+ source: "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ ${_param:linux_system_codename}-updates main restricted universe"
architectures: amd64
default: true
key_id: 437D05B5
key_server: keyserver.ubuntu.com
ubuntu_security:
- source: "deb http://archive.ubuntu.com/ubuntu/ ${_param:linux_system_codename}-security main restricted universe"
+ source: "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ ${_param:linux_system_codename}-security main restricted universe"
architectures: amd64
default: true
key_id: 437D05B5