Merge "Add Dzmitry Stremkouski key to services team"
diff --git a/jenkins/client/job/oscore/cookiecutter.yml b/jenkins/client/job/oscore/cookiecutter.yml
index c1b193d..04a805a 100644
--- a/jenkins/client/job/oscore/cookiecutter.yml
+++ b/jenkins/client/job/oscore/cookiecutter.yml
@@ -28,8 +28,12 @@
type: choice
description: "Context for coockiecutter template specified as filename."
choices:
- - openstack_ovs_non-dvr_vlan
- - openstack_ovs_non-dvr_vxlan
+ - openstack-ovs-core-pike
+ - openstack-ovs-core-ssl-pike
+ - openstack-ovs-core-barbican-pike
+ - openstack-ovs-core-manila-pike
+ - openstack-ovs-core-telemetry-pike
+ - openstack-ovs-core-queens
STACK_INSTALL:
type: string
default: 'core,openstack,ovs'
@@ -69,3 +73,57 @@
type: boolean
description: "Delete Heat stack when finished (bool)"
default: 'false'
+ oscore-test-cookiecutter-models:
+ display_name: oscore-test-cookiecutter-models
+ name: oscore-test-cookiecutter-models
+ concurrent: true
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
+ credentials: "gerrit"
+ branch: 'master'
+ script: test-cookiecutter-models-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ "^mk/cookiecutter-templates$":
+ compare_type: 'REG_EXP'
+ branches:
+ - master
+ skip_vote:
+ - successful
+ - failed
+ - unstable
+ - not_built
+ event:
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
+ param:
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ description: "ID of jenkins credentials to be used when connecting to gerrit."
+ OPENSTACK_API_PROJECT:
+ type: string
+ default: "mcp-oscore-ci"
+ HEAT_STACK_ZONE:
+ type: string
+ default: "mcp-oscore-ci"
+ FLAVOR_PREFIX:
+ type: string
+ default: 'dev'
+ TEST_SCHEME:
+ type: text
+ description: "Yaml based scheme to test specific models."
+ default: |-
+ openstack-ovs-core-pike:
+ run_smoke: true
+ stack_install: 'core,openstack,ovs'
diff --git a/maas/region/boot_sources/maas_ephemeral_v3/bss_xenial.yml b/maas/region/boot_sources/maas_ephemeral_v3/bss_xenial.yml
new file mode 100644
index 0000000..a1d1620
--- /dev/null
+++ b/maas/region/boot_sources/maas_ephemeral_v3/bss_xenial.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ maas_region_boot_sources_maas_ephemeral_v3_version: ${_param:apt_mk_version}
+ maas_region_boot_sources_maas_ephemeral_v3_host_url: "http://mirror.mirantis.com/"
+ # http://mirror.mirantis.com/nightly/maas-ephemeral-v3/
+ maas_region_boot_sources_maas_ephemeral_v3_url: "${_param:linux_system_repo_maas_ephemeral_v3_host_url}/${_param:apt_mk_version}/maas-ephemeral-v3/"
+ maas:
+ region:
+ boot_sources_selections:
+ xenial:
+ url: "${_param:maas_region_boot_sources_maas_ephemeral_v3_url}"
+ os: "ubuntu"
+ release: "xenial"
+ arches: "amd64"
+ subarches: '"*"'
+ labels: '"*"'
diff --git a/maas/region/boot_sources/maas_ephemeral_v3/init.yml b/maas/region/boot_sources/maas_ephemeral_v3/init.yml
new file mode 100644
index 0000000..965f333
--- /dev/null
+++ b/maas/region/boot_sources/maas_ephemeral_v3/init.yml
@@ -0,0 +1,14 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ maas_region_boot_sources_maas_ephemeral_v3_version: ${_param:apt_mk_version}
+ maas_region_boot_sources_maas_ephemeral_v3_host_url: "http://mirror.mirantis.com/"
+ # http://mirror.mirantis.com/nightly/maas-ephemeral-v3/
+ maas_region_boot_sources_maas_ephemeral_v3_url: "${_param:linux_system_repo_maas_ephemeral_v3_host_url}/${_param:apt_mk_version}/maas-ephemeral-v3/"
+ maas:
+ region:
+ boot_sources_delete_all_others: true
+ boot_sources:
+ resources_mirror:
+ url: ${_param:maas_region_boot_sources_maas_ephemeral_v3_url}
+ keyring_file: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg