Merge "Fixed new aptly.server.mirror classes typos"
diff --git a/gerrit/server/single.yml b/gerrit/server/single.yml
index 952e82e..6704f97 100644
--- a/gerrit/server/single.yml
+++ b/gerrit/server/single.yml
@@ -38,6 +38,11 @@
hash: sha256=45786a920a929c6258de6461bcf03ddec8925577bd485905f102ceb6e5e1e47c
# address: https://gerrit-ci.gerritforge.com/job/Gerrit-stable-2.13/20/artifact/buck-out/gen/gerrit.war
# hash: md5=2e17064b8742c4622815593ec496c571
+ receive_timeout: 5min
+ sshd:
+ threads: 64
+ batch_threads: 16
+ max_connections_per_user: 64
database:
engine: postgresql
host: localhost
@@ -45,6 +50,8 @@
name: gerrit
user: gerrit
password: ${_param:postgresql_gerrit_password}
+ pool_limit: 250
+ pool_max_idle: 16
postgresql:
server:
version: "9.5"
diff --git a/jenkins/client/job/deploy/update/init.yml b/jenkins/client/job/deploy/update/init.yml
index db92e3b..4e6f460 100644
--- a/jenkins/client/job/deploy/update/init.yml
+++ b/jenkins/client/job/deploy/update/init.yml
@@ -9,6 +9,7 @@
- system.jenkins.client.job.deploy.update.upgrade_mcp_release
- system.jenkins.client.job.deploy.update.upgrade_ovs_gateway
- system.jenkins.client.job.deploy.update.upgrade_opencontrail
+ - system.jenkins.client.job.deploy.update.upgrade_opencontrail4_0
- system.jenkins.client.job.deploy.update.restore_mysql
- system.jenkins.client.job.deploy.update.restore_cassandra
- system.jenkins.client.job.deploy.update.restore_zookeeper
diff --git a/jenkins/client/job/deploy/update/upgrade_opencontrail4_0.yml b/jenkins/client/job/deploy/update/upgrade_opencontrail4_0.yml
new file mode 100644
index 0000000..f622371
--- /dev/null
+++ b/jenkins/client/job/deploy/update/upgrade_opencontrail4_0.yml
@@ -0,0 +1,50 @@
+#
+# Jobs to update packages on given Salt master environment
+#
+parameters:
+ _param:
+ jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+ jenkins:
+ client:
+ job:
+ deploy-upgrade-opencontrail40:
+ type: workflow-scm
+ concurrent: true
+ display_name: "Deploy - upgrade Opencontrail to 4.x"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
+ credentials: "gerrit"
+ script: opencontrail40-upgrade.groovy
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ STAGE_CONTROLLERS_UPGRADE:
+ type: boolean
+ default: 'true'
+ description: "Run upgrade on Opencontrail controllers"
+ STAGE_COMPUTES_UPGRADE:
+ type: boolean
+ default: 'true'
+ description: "Run upgrade on Opencontrail compute nodes"
+ COMPUTE_TARGET_SERVERS:
+ type: string
+ default: "cmp*"
+ description: Salt compound target to match nodes to be updated [*, G@osfamily:debian].
+ COMPUTE_TARGET_SUBSET_LIVE:
+ type: string
+ default: '1'
+ description: Number of selected nodes to live apply compute upgrade.
+ STAGE_CONTROLLERS_ROLLBACK:
+ type: boolean
+ default: 'false'
+ description: "Run rollback on Opencontrail controllers"
+ STAGE_COMPUTES_ROLLBACK:
+ type: boolean
+ default: 'false'
+ description: "Run rollback on Opencontrail compute nodes"
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index b5c596b..2e29d65 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -173,7 +173,7 @@
name: test-salt-formulas-env
discard:
build:
- keep_num: 500
+ keep_num: 1000
artifact:
keep_num: 10
type: workflow-scm
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index ec35f94..879a1f1 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -173,7 +173,7 @@
name: test-salt-model-node
discard:
build:
- keep_num: 500
+ keep_num: 1000
artifact:
keep_num: 10
type: workflow-scm