Merge "Add test-deploy-virtual-model-change-template template"
diff --git a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
index ba4e945..a0f8657 100644
--- a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
@@ -18,15 +18,50 @@
log_file: "/var/log/debmirror/mirror_mirantis_com_ubuntu_xenial.log"
dist: [ xenial , xenial-security, xenial-updates ]
section: [ main , multiverse, restricted, universe ]
- exclude_deb_section: [ games, gnome, Xfce, sound, electronics, graphics, hamradio , doc, localization, kde, video ]
+ exclude_deb_section: [ games, gnome, Xfce, sound, electronics, graphics, hamradio , doc, localization, kde, video, translations, news, x11,
+ 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, universe/Xfce, universe/sound, universe/electronics, universe/hamradio , universe/doc, universe/localization, universe/kde,
+ universe/video, universe/translations, universe/news, universe/x11, universe/graphics,
+ restricted/games, restricted/gnome, restricted/Xfce, restricted/sound, restricted/electronics, restricted/graphics, restricted/hamradio , restricted/doc,
+ restricted/localization, restricted/kde, restricted/video, restricted/translations, restricted/news, restricted/x11 ]
filter:
- 01: "--exclude='/android*'"
- 02: "--exclude='/firefox*'"
- 03: "--exclude='/chromium-browser*'"
- 04: "--exclude='/ceph*'"
- 05: "--exclude='/*-wallpapers*'"
- 06: "--exclude='/language-pack-(?!en)'"
- 07: "--include='/main(.*)manpages'"
- 08: "--include='/main(.*)python-(.*)doc'"
- 09: "--include='/main(.*)python-(.*)network'"
-
+ 1: "--exclude='android*'"
+ 2: "--exclude='/firefox*'"
+ 3: "--exclude='/chromium-browser*'"
+ 4: "--exclude='/ceph*'"
+ 5: "--exclude='/*-wallpapers*'"
+ 6: "--exclude='/language-pack-(?!en)'"
+ 7: "--exclude='thunderbird*'"
+ 8: "--exclude='libreoffice*'"
+ 9: "--exclude='openoffice*'"
+ 10: "--exclude='live-image-*-desktop*'"
+ 11: "--exclude='lubuntu-*'"
+ 12: "--exclude='kubuntu-*'"
+ 13: "--exclude='cinnamon-*'"
+ 14: "--exclude='mate-*'"
+ 15: "--exclude='desktop-*'"
+ 16: "--exclude='flashplugin*'"
+ 17: "--exclude='gnome*'"
+ 18: "--exclude='/unity*'"
+ 20: "--exclude='openjdk-*-(dbg|demo|source).*'"
+ 22: "--exclude='(kde|ubuntu|xfce4|sabily).*artwork*'"
+ 23: "--exclude='ubuntu-touch*'"
+ 24: "--exclude='remmina*'"
+ 25: "--exclude='/libbluetooth*'"
+ 26: "--exclude='/libandroid*'"
+ 27: "--exclude='/banshee*'"
+ 27: "--exclude='/*(.xorg)*joystick'"
+ 28: "--exclude='/xserver-xorg-video(.*vivid|.*wily|.*utopic)'"
+ 30: "--exclude='/*universe.*bluez.*'"
+ 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).*'"
+ 95: "--exclude='/gcc-.*-cross.*'"
+ 96: "--exclude='/(nvidia).*'"
+ 97: "--exclude='linux-*-(.*azure|.*aws|gke|.*azure-edge|.*linux-oem)'"
+ 98: "--exclude='/.*(arm64|powerpc|s390x|armel|armhf|sparc64|mips64|ppc64el|mipsn32)(?!.*amd64)'"
+ 99: "--exclude='/*universe.*(-armel-|-arm-)(?!.*amd64)'"
+ 100: "--include='/main(.*)manpages'"
+ 101: "--include='/main(.*)python-(.*)doc'"
+ 102: "--include='/main(.*)python-(.*)network'"
diff --git a/jenkins/client/job/debian/packages/salt-multi.yml b/jenkins/client/job/debian/packages/salt-multi.yml
index a81302e..e185b60 100644
--- a/jenkins/client/job/debian/packages/salt-multi.yml
+++ b/jenkins/client/job/debian/packages/salt-multi.yml
@@ -111,10 +111,10 @@
default: 'true'
EXTRA_REPO_URL:
type: string
- default: "deb ${_param:jenkins_aptly_url}/{{dist}}/ testing salt salt-latest"
+ default: "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main; deb ${_param:jenkins_aptly_url}/{{dist}}/ testing salt"
EXTRA_REPO_KEY_URL:
type: string
- default: "${_param:jenkins_aptly_url}/public.gpg"
+ default: "https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub; ${_param:jenkins_aptly_url}/public.gpg"
APTLY_URL:
type: string
default: "${_param:jenkins_aptly_api_url}"
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index b04e3da..4cf664f 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -64,6 +64,10 @@
type: string
default: '{{stack_reclass_branch}}'
description: 'Branch of repository with stack salt models'
+ STACK_CLUSTER_NAME:
+ type: string
+ default: ""
+ description: "Cluster name to use from reclass"
# salt
SALT_OVERRIDES:
type: text
@@ -676,11 +680,11 @@
description: Whether to make a snapshot build
EXTRA_REPO_URL:
type: string
- default: "deb ${_param:jenkins_aptly_url}/{{dist}}/ testing salt salt-latest"
+ default: "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main; deb ${_param:jenkins_aptly_url}/{{dist}}/ testing salt"
description: Extra repo for building process
EXTRA_REPO_KEY_URL:
type: string
- default: "${_param:jenkins_aptly_url}/public.gpg"
+ default: "https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub; ${_param:jenkins_aptly_url}/public.gpg"
description: Extra repo GPG public key URL
OS:
type: string
diff --git a/kubernetes/master/cluster.yml b/kubernetes/master/cluster.yml
index 5db89c6..78e91a0 100644
--- a/kubernetes/master/cluster.yml
+++ b/kubernetes/master/cluster.yml
@@ -11,7 +11,6 @@
master:
container: false
network:
- engine: calico
calico:
prometheus:
enabled: true
diff --git a/kubernetes/master/single.yml b/kubernetes/master/single.yml
index cc8d8ab..684af64 100644
--- a/kubernetes/master/single.yml
+++ b/kubernetes/master/single.yml
@@ -7,5 +7,3 @@
kubernetes:
master:
container: false
- network:
- engine: calico
diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml
index 2491dce..d223d57 100644
--- a/kubernetes/pool/cluster.yml
+++ b/kubernetes/pool/cluster.yml
@@ -15,7 +15,6 @@
pool:
container: false
network:
- engine: calico
calico:
prometheus:
enabled: true
diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml
index 883114b..d6282c3 100644
--- a/kubernetes/pool/single.yml
+++ b/kubernetes/pool/single.yml
@@ -14,8 +14,6 @@
kubernetes:
pool:
container: false
- network:
- engine: calico
docker:
host:
options: