Merge "Add dogtag formulas to salt pkg|git"
diff --git a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
index 09dee22..20cf1e0 100644
--- a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
@@ -18,8 +18,9 @@
log_file: "/var/log/debmirror/mirror_mirantis_com_ubuntu_xenial.log"
dist: [ xenial , xenial-security, xenial-updates ]
section: [ main , multiverse, restricted, universe ]
+ # Don't exclude main/x11 - its required for many pkgs.
exclude_deb_section: [games, gnome, Xfce, sound, electronics, graphics, hamradio,
- doc, localization, kde, video, translations, news, x11, multiverse/games, multiverse/gnome,
+ doc, localization, kde, video, translations, news, multiverse/games, multiverse/gnome,
multiverse/Xfce, multiverse/sound, multiverse/electronics, multiverse/graphics,
multiverse/hamradio, multiverse/doc, multiverse/localization, multiverse/kde, multiverse/video,
multiverse/translations, multiverse/news, multiverse/x11, universe/games, universe/gnome,
@@ -58,9 +59,26 @@
27: "--exclude='/*(.xorg)*joystick'"
28: "--exclude='/xserver-xorg-video(.*vivid|.*wily|.*utopic)'"
30: "--exclude='/*universe.*bluez.*'"
+ 31: "--exclude='/main/m/maas/'" # ppa should be always used
+ 32: "--exclude='/main/a/a11y-profile-manager/'"
+ 33: "--exclude='/universe/.*(alsa|ubuntuone|telepathy|debian-multimedia|kodi|mediaplayer|nagios|getfem|gammaray|geotranz)'"
+ 34: "--exclude='/universe/.*(pyqt|usb-creator|gcc-mingw-w64|gcc-snapshot)'"
+ 35: "--exclude='/universe/q/qt'"
+ 36: "--exclude='/universe/g/glusterfs/'" # ppa should be always used
+ 37: "--exclude='/universe/d/docker.io/'" # ppa should be always used
+ 38: "--exclude='/universe/a/aptly'" # ppa should be always used
+ 39: "--exclude='/universe/e/elasticsearch'" # ppa should be always used
+ 40: "--exclude='/universe/g/grafana/'" # ppa should be always used
+ 41: "--exclude='/universe/i/influxdb(?!.*python)'" # ppa should be always used
+ 42: "--exclude='/universe/s/salt'" # ppa should be always used
+ 43: "--exclude='/universe/z/zabbix'" # ppa should be always used
+ 44: "--exclude='/universe/.*(brasero|mediascanner2|mediatomb|mediawiki|qtmultimedia|pidgin|skype|eclipse|esys-particle|fusion)'"
+ 89: "--exclude='/universe/k/(kde)'"
+ 90: "--exclude='/universe/p/(psi-plus|puppet-module|plasma|pcl/)'"
+ 91: "--exclude='golang-github-*'"
92: "--exclude='/(llvm-toolchain|address-book|amule|openclipart|rhythmbox|gimp|sonic-visualiser|games|bsdgame|gazebo|arduino|webkitgtk|widelands|wxwidget|warzone|wings3d).*'"
93: "--exclude='/(asterisk|abiword|webbrowser-app|imagemagick|.*clamav|wireshar|vlc|.*transmission|tryton-modules|trilinos|tomboy|wine1|wine-dev|compiz|mythtv|ubuntustudio).*'"
- 94: "--exclude='/(ceilometer|nova).*'"
+ 94: "--exclude='/(ceilometer|nova|openstack-debian-images).*'"
95: "--exclude='/gcc-.*-cross.*'"
96: "--exclude='/(nvidia).*'"
97: "--exclude='linux-*-(.*azure|.*aws|gke|.*azure-edge|.*linux-oem)'"
@@ -70,4 +88,6 @@
100: "--include='/main(.*)manpages'"
101: "--include='/main(.*)python-(.*)doc'"
102: "--include='/main(.*)python-(.*)network'"
- 103: "--include='/main(.*)unittest2'"
+ 103: "--include='/main(.*)unittest2'" # openstack* pkgs
+ 104: "--include='/main(.*)libbluetooth3'" # python-guestfs
+
diff --git a/gerrit/client/init.yml b/gerrit/client/init.yml
index 8b097ee..5d719d4 100644
--- a/gerrit/client/init.yml
+++ b/gerrit/client/init.yml
@@ -59,13 +59,34 @@
score: -1..+1
"refs/tags/*":
actions:
+ - name: pushTag
+ group: Administrators
+ force: true
+ - name: pushTag
+ group: Project Owners
+ force: true
- name: pushSignedTag
group: devops-core
+ - name: pushSignedTag
+ group: Administrators
+ - name: pushSignedTag
+ group: Project Owners
- name: create
group: devops-core
+ - name: create
+ group: Administrators
- name: push
group: devops-core
+ - name: push
+ group: Administrators
+ force: true
- name: forgeCommitter
group: devops-core
+ - name: forgeCommitter
+ group: Administrators
- name: forgeAuthor
group: devops-core
+ - name: forgeAuthor
+ group: Administrators
+ - name: forgeServerAsCommitter
+ group: Administrators
diff --git a/jenkins/client/job/deploy/update/update_mirror_image.yml b/jenkins/client/job/deploy/update/update_mirror_image.yml
index ec812c4..2b2dc26 100644
--- a/jenkins/client/job/deploy/update/update_mirror_image.yml
+++ b/jenkins/client/job/deploy/update/update_mirror_image.yml
@@ -10,7 +10,7 @@
deploy-update-mirror-image:
type: workflow-scm
concurrent: true
- display_name: "Deploy - update mirror image"
+ display_name: "Deploy - update local mirror"
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
@@ -30,6 +30,9 @@
UPDATE_APTLY_MIRRORS:
type: string
default: ""
+ RECREATE_APTLY_MIRRORS:
+ type: boolean
+ default: 'true'
PUBLISH_APTLY:
type: boolean
default: 'true'
@@ -42,6 +45,9 @@
CLEANUP_APTLY:
type: boolean
default: 'false'
+ UPDATE_DEBMIRRORS:
+ type: boolean
+ default: 'true'
UPDATE_DOCKER_REGISTRY:
type: boolean
default: 'true'
@@ -54,6 +60,6 @@
UPDATE_GIT:
type: boolean
default: 'true'
- UPDATE_IMAGES:
+ UPDATE_FILES:
type: boolean
default: 'true'
\ No newline at end of file
diff --git a/jenkins/client/job/git-mirrors/downstream/pipelines.yml b/jenkins/client/job/git-mirrors/downstream/pipelines.yml
index 7bf366c..271a725 100644
--- a/jenkins/client/job/git-mirrors/downstream/pipelines.yml
+++ b/jenkins/client/job/git-mirrors/downstream/pipelines.yml
@@ -2,12 +2,14 @@
- system.jenkins.client.job.git-mirrors.downstream
parameters:
_param:
+ gerrit_pipeline_library_repo: https://github.com/Mirantis/pipeline-library
+ gerrit_mk_pipelines_repo: https://github.com/Mirantis/mk-pipelines
jenkins_git_mirror_downstream_jobs:
- name: pipeline-library
downstream: mcp-ci/pipeline-library
- upstream: "https://github.com/Mirantis/pipeline-library"
+ upstream: "${_param:gerrit_pipeline_library_repo}"
branches: master
- name: mk-pipelines
downstream: mk/mk-pipelines
- upstream: "https://github.com/Mirantis/mk-pipelines"
+ upstream: "${_param:gerrit_mk_pipelines_repo}"
branches: master
diff --git a/jenkins/client/job/oscore/qa.yml b/jenkins/client/job/oscore/qa.yml
index 258baa7..b7319b4 100644
--- a/jenkins/client/job/oscore/qa.yml
+++ b/jenkins/client/job/oscore/qa.yml
@@ -164,18 +164,10 @@
type: string
default: "3"
# test
- TEST_TEMPEST_CONF:
- type: string
- description: Tempest configuration file path inside container
- default: "{{tempest_conf}}"
TEST_CONF:
type: string
description: Tempest configuration file path inside container
default: "{{test_conf}}"
- TEST_TEMPEST_TARGET:
- type: string
- description: Node to run tests
- default: "{{tempest_target}}"
TEST_TARGET:
type: string
description: Node to run tests
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 8012d61..377ae0d 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -103,26 +103,14 @@
type: string
default: "3"
# test
- TEST_TEMPEST_CONF:
- type: string
- description: Tempest configuration file path inside container
- default: "{{tempest_conf}}"
TEST_CONF:
type: string
description: Tempest configuration file path inside container
default: "{{test_conf}}"
- TEST_TEMPEST_TARGET:
- type: string
- description: Node to run tests
- default: "{{tempest_target}}"
TEST_TARGET:
type: string
description: Node to run tests
default: "{{test_target}}"
- TEST_TEMPEST_PATTERN:
- type: string
- description: Run tests matched to pattern only
- default: "tempest"
TEST_PATTERN:
type: string
description: Run tests matched to pattern only
@@ -265,26 +253,14 @@
type: string
description: Product milestone
default: "{{milestone}}"
- TEST_TEMPEST_CONF:
- type: string
- description: Tempest configuration file path inside container
- default: "{{tempest_conf}}"
TEST_CONF:
type: string
description: Tempest configuration file path inside container
default: "{{test_conf}}"
- TEST_TEMPEST_TARGET:
- type: string
- description: Node to run tests
- default: "{{tempest_target}}"
TEST_TARGET:
type: string
description: Node to run tests
default: "{{test_target}}"
- TEST_TEMPEST_PATTERN:
- type: string
- description: Run tests matched to pattern only
- default: "{{test_pattern}}"
TEST_PATTERN:
type: string
description: Run tests matched to pattern only
@@ -359,16 +335,9 @@
type: boolean
default: 'false'
description: Upload results to testrail or not
- TEST_TEMPEST_TARGET:
- type: string
- description: Salt target to run tests
TEST_TARGET:
type: string
description: Salt target to run tests
- TEST_TEMPEST_IMAGE:
- type: string
- description: Url to tempest docker image
- default: "{{test_image}}"
TEST_IMAGE:
type: string
description: Url to tempest docker image
@@ -377,30 +346,16 @@
type: string
description: Path to local docker image
default: ''
- TEST_TEMPEST_PATTERN:
- type: string
- description: Run tests matched to pattern only
TEST_PATTERN:
type: string
description: Run tests matched to pattern only
- TEST_TEMPEST_SET:
- type: string
- description: Run tests matched by tempest set only
TEST_SET:
type: string
description: Run tests matched by tempest set only
- TEST_TEMPEST_CONCURRENCY:
- type: string
- description: How much test threads to run
- default: "2"
TEST_CONCURRENCY:
type: string
description: How much test threads to run
default: "2"
- TEST_TEMPEST_CONF:
- type: string
- description: Tempest configuration file path inside container
- default: "mcp.conf"
TEST_CONF:
type: string
description: Tempest configuration file path inside container
@@ -460,9 +415,6 @@
type: string
default: "{{testrail_credentials}}"
description: Credentials for results upload to testrail
- TEST_TEMPEST_TARGET:
- type: string
- description: Node to run tests
TEST_TARGET:
type: string
description: Node to run tests
diff --git a/neutron/control/opendaylight/cluster.yml b/neutron/control/opendaylight/cluster.yml
index 7a62e8b..1f8142e 100644
--- a/neutron/control/opendaylight/cluster.yml
+++ b/neutron/control/opendaylight/cluster.yml
@@ -17,7 +17,6 @@
password: admin
ovsdb_connection: tcp:127.0.0.1:6639
router: ${_param:opendaylight_router}
- enable_websocket: true
mechanism:
ovs:
driver: ${_param:opendaylight_driver}
diff --git a/neutron/control/opendaylight/single.yml b/neutron/control/opendaylight/single.yml
index e0c3ea9..297cfa0 100644
--- a/neutron/control/opendaylight/single.yml
+++ b/neutron/control/opendaylight/single.yml
@@ -15,7 +15,6 @@
password: admin
ovsdb_connection: tcp:127.0.0.1:6639
router: ${_param:opendaylight_router}
- enable_websocket: true
mechanism:
ovs:
driver: ${_param:opendaylight_driver}