Merge "Fix xenial-debmirror mirror"
diff --git a/jenkins/client/job/deploy/lab/component/kubernetes.yml b/jenkins/client/job/deploy/lab/component/kubernetes.yml
index 62526f7..8cbf766 100644
--- a/jenkins/client/job/deploy/lab/component/kubernetes.yml
+++ b/jenkins/client/job/deploy/lab/component/kubernetes.yml
@@ -25,7 +25,7 @@
stack_env: devcloud
stack_type: heat
stack_install: core,k8s,calico
- stack_test: ""
+ stack_test: "k8s"
job_timer: "H H(0-6) * * *"
- stack_name: k8s_ha_contrail
stack_env: devcloud
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 3000d71..8012d61 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -728,7 +728,7 @@
trigger:
gerrit:
project:
- "^salt-formulas/(nova|cinder|glance|keystone|horizon|neutron|designate|heat|ironic|barbican|salt|linux|reclass|galera|memcached|rabbitmq|bind|apache)$":
+ "^salt-formulas/(nova|cinder|glance|keystone|horizon|neutron|designate|heat|ironic|barbican|aodh|ceilometer|gnocchi|panko|manila|salt|linux|reclass|galera|memcached|rabbitmq|bind|apache)$":
compare_type: 'REG_EXP'
branches:
- master
diff --git a/jenkins/client/job/saas/init.yml b/jenkins/client/job/saas/init.yml
index 5ec05c1..33ebbe4 100644
--- a/jenkins/client/job/saas/init.yml
+++ b/jenkins/client/job/saas/init.yml
@@ -1,2 +1,3 @@
classes:
- system.jenkins.client.job.saas.test_saas_ui
+ - system.jenkins.client.job.saas.test_saas_core_auth
diff --git a/jenkins/client/job/saas/test_saas_core_auth.yml b/jenkins/client/job/saas/test_saas_core_auth.yml
new file mode 100644
index 0000000..1ff2339
--- /dev/null
+++ b/jenkins/client/job/saas/test_saas_core_auth.yml
@@ -0,0 +1,43 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ test-saas-core-auth:
+ name: test-saas-core-auth
+ discard:
+ build:
+ keep_num: 15
+ artifact:
+ keep_num: 15
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
+ credentials: "gerrit"
+ script: test-saas-core-auth-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ "saas/core/auth":
+ branches:
+ - master
+ event:
+ patchset:
+ - created:
+ excludeDrafts: false
+ excludeTrivialRebase: false
+ excludeNoCodeChange: false
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
+ param:
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ DEFAULT_GIT_URL:
+ type: string
+ default: "${_param:jenkins_gerrit_url}/saas/core/auth"
+ DEFAULT_GIT_REF:
+ type: string
+ default: master
diff --git a/manila/share/init.yml b/manila/share/init.yml
index af85c0d..2c6558e 100644
--- a/manila/share/init.yml
+++ b/manila/share/init.yml
@@ -1,5 +1,5 @@
classes:
- - system.manila.common.cluster
+ - service.manila.common.cluster
parameters:
manila:
common: