From 8cf23a6c312c5318c05c6e6b97f1a3f7ca34f0e4 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Wed, 1 Dec 2021 16:53:33 +0100
Subject: switch source images to follow master branches

We passed R-17 point.

Watcher and vmtp are disabled due to PrettyTable version conflict.

Change-Id: Ia4cbc70f1dc54a5654ccf770c9a866dcb6fef52a
---
 kolla/common/config.py | 2 +-
 kolla/image/build.py   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/kolla/common/config.py b/kolla/common/config.py
index fc80ed08f..953a58f21 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -32,7 +32,7 @@ DISTRO_PRETTY_NAME = {
     'debian': 'Debian GNU/Linux 11 (bullseye)',
     'ubuntu': 'Ubuntu 20.04',
 }
-OPENSTACK_RELEASE = 'xena'
+OPENSTACK_RELEASE = 'master'
 
 # This is noarch repository so we will use it on all architectures
 DELOREAN = "https://trunk.rdoproject.org/centos8-xena/" \
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 76cd1a859..ad8ab0ff0 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -98,6 +98,11 @@ UNBUILDABLE_IMAGES = {
         "zun-base",
     },
 
+    'source': {
+        "watcher-base",  # https://bugs.launchpad.net/watcher/+bug/1952944
+        "vmtp",          # https://review.opendev.org/c/x/vmtp/+/820057
+    },
+
     'centos': {
         "hacluster-pcs",         # Missing crmsh package
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
-- 
cgit v1.2.3