Merge "Add Pushkin notification configuration"
diff --git a/jenkins/client/job/deploy/lab/cicd.yml b/jenkins/client/job/deploy/lab/cicd.yml
index fb1dd92..8a2893c 100644
--- a/jenkins/client/job/deploy/lab/cicd.yml
+++ b/jenkins/client/job/deploy/lab/cicd.yml
@@ -35,13 +35,13 @@
default: "{{lab}}"
HEAT_STACK_ENVIRONMENT:
type: string
- default: "tcpisek"
+ default: "devcloud"
HEAT_STACK_ZONE:
type: string
- default: "mirantis-zone-qa"
+ default: "mcp-mk"
HEAT_STACK_PUBLIC_NET:
type: string
- default: "mirantis-private"
+ default: "public"
HEAT_STACK_DELETE:
type: boolean
default: 'true'
@@ -62,19 +62,19 @@
# openstack api
OPENSTACK_API_URL:
type: string
- default: "https://vpc.tcpisek.cz:5000"
+ default: "https://cloud-cz.bud.mirantis.net:5000"
OPENSTACK_API_CREDENTIALS:
type: string
default: "openstack-qa-credentials"
OPENSTACK_API_PROJECT:
type: string
- default: "mirantis_mk20_qa"
+ default: "mcp-mk"
OPENSTACK_API_CLIENT:
type: string
- default: "liberty"
+ default: ""
OPENSTACK_API_VERSION:
type: string
- default: "2"
+ default: "3"
OPENSTACK_API_PROJECT_DOMAIN:
type: string
default: "default"
diff --git a/jenkins/client/job/opencontrail/build/test.yml b/jenkins/client/job/opencontrail/build/test.yml
index 0d1f7bf..efb09f9 100644
--- a/jenkins/client/job/opencontrail/build/test.yml
+++ b/jenkins/client/job/opencontrail/build/test.yml
@@ -64,7 +64,7 @@
event:
comment:
- addedContains:
- commentAddedCommentContains: "^(test|recheck|reverify)$"
+ commentAddedCommentContains: '^(?s:Patch Set \d+:\s*(test|recheck|reverify)\s*)$'
param:
TEST_MODELS:
type: string
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index a1147e7..7fa88e1 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -136,7 +136,7 @@
event:
comment:
- addedContains:
- commentAddedCommentContains: "^(test|recheck|reverify)$"
+ commentAddedCommentContains: '^(?s:Patch Set \d+:\s*(test|recheck|reverify)\s*)$'
param:
SALT_VERSION:
type: string
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 70b85b0..81f0234 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -24,7 +24,7 @@
event:
comment:
- addedContains:
- commentAddedCommentContains: "^(test|recheck|reverify)$"
+ commentAddedCommentContains: '^(?s:Patch Set \d+:\s*(test|recheck|reverify)\s*)$'
param:
SALT_OPTS:
type: string
@@ -106,7 +106,7 @@
event:
comment:
- addedContains:
- commentAddedCommentContains: "^(test|recheck|reverify)$"
+ commentAddedCommentContains: '^(?s:Patch Set \d+:\s*(test|recheck|reverify)\s*)$'
param:
COOKIECUTTER_TEMPLATE_URL:
type: string
@@ -134,7 +134,7 @@
name: test-salt-model-node
discard:
build:
- keep_num: 10
+ keep_num: 500
artifact:
keep_num: 10
type: workflow-scm