From 1e133b8e9f4453f0be4710e2be5af6bbe573da54 Mon Sep 17 00:00:00 2001
From: Sean Eagan <sean.eagan@att.com>
Date: Mon, 26 Aug 2019 09:12:49 -0500
Subject: [PATCH] Fix armada and deckhand image tags

Those components are now publishing `master-ubuntu_xenial` rather
thans `master` tags, so promenade was using out of date versions.

Change-Id: Ic2a2634fe8a4c051984236d04a90e6dd203cdd2b
---
 examples/basic/Genesis.yaml                 | 2 +-
 examples/complete/Genesis.yaml              | 2 +-
 examples/complete/armada-resources.yaml     | 4 ++--
 examples/gate/Genesis.yaml                  | 2 +-
 tests/unit/api/test_validatedesign.py       | 2 +-
 tests/unit/builder_data/simple/Genesis.yaml | 2 +-
 tools/gate/default-config-env               | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml
index d32952c2..a233eac5 100644
--- a/examples/basic/Genesis.yaml
+++ b/examples/basic/Genesis.yaml
@@ -45,7 +45,7 @@ data:
       - promenade-genesis=enabled
       - ucp-control-plane=enabled
   images:
-    armada: quay.io/airshipit/armada:master
+    armada: quay.io/airshipit/armada:master-ubuntu_xenial
     helm:
       tiller: gcr.io/kubernetes-helm/tiller:v2.14.0
     kubernetes:
diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml
index 01eda3cf..4534823c 100644
--- a/examples/complete/Genesis.yaml
+++ b/examples/complete/Genesis.yaml
@@ -31,7 +31,7 @@ data:
       - promenade-genesis=enabled
       - ucp-control-plane=enabled
   images:
-    armada: quay.io/airshipit/armada:master
+    armada: quay.io/airshipit/armada:master-ubuntu_xenial
     helm:
       tiller: gcr.io/kubernetes-helm/tiller:v2.14.0
     kubernetes:
diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml
index 83977757..6535c3b6 100644
--- a/examples/complete/armada-resources.yaml
+++ b/examples/complete/armada-resources.yaml
@@ -1718,7 +1718,7 @@ data:
             password: sergtsop
     images:
       tags:
-        deckhand: quay.io/airshipit/deckhand:master
+        deckhand: quay.io/airshipit/deckhand:master-ubuntu_xenial
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
         db_init: docker.io/postgres:9.5
         db_sync: docker.io/postgres:9.5
@@ -1857,7 +1857,7 @@ data:
           tiller_namespace: kube-system
     images:
       tags:
-        api: quay.io/airshipit/armada:master
+        api: quay.io/airshipit/armada:master-ubuntu_xenial
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
         ks_endpoints: docker.io/openstackhelm/heat:newton
         ks_service: docker.io/openstackhelm/heat:newton
diff --git a/examples/gate/Genesis.yaml b/examples/gate/Genesis.yaml
index 90fbc8ea..e4697664 100644
--- a/examples/gate/Genesis.yaml
+++ b/examples/gate/Genesis.yaml
@@ -45,7 +45,7 @@ data:
       - promenade-genesis=enabled
       - ucp-control-plane=enabled
   images:
-    armada: quay.io/airshipit/armada:master
+    armada: quay.io/airshipit/armada:master-ubuntu_xenial
     helm:
       tiller: gcr.io/kubernetes-helm/tiller:v2.14.0
     kubernetes:
diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py
index ff4f4881..21431563 100644
--- a/tests/unit/api/test_validatedesign.py
+++ b/tests/unit/api/test_validatedesign.py
@@ -101,7 +101,7 @@ VALID_DOCS = [
             'hostname':
             'n0',
             'images': {
-                'armada': 'quay.io/airshipit/armada:master',
+                'armada': 'quay.io/airshipit/armada:master-ubuntu_xenial',
                 'helm': {
                     'tiller': 'gcr.io/kubernetes-helm/tiller:v2.14.0'
                 },
diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml
index c4ba853e..01f8c83e 100644
--- a/tests/unit/builder_data/simple/Genesis.yaml
+++ b/tests/unit/builder_data/simple/Genesis.yaml
@@ -30,7 +30,7 @@ data:
       - promenade-genesis=enabled
       - ucp-control-plane=enabled
   images:
-    armada: quay.io/airshipit/armada:master
+    armada: quay.io/airshipit/armada:master-ubuntu_xenial
     helm:
       tiller: gcr.io/kubernetes-helm/tiller:v2.14.0
     kubernetes:
diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env
index 8b5fa7cf..a96a6b8b 100644
--- a/tools/gate/default-config-env
+++ b/tools/gate/default-config-env
@@ -1,4 +1,4 @@
-IMAGE_ARMADA=quay.io/airshipit/armada:master
+IMAGE_ARMADA=quay.io/airshipit/armada:master-ubuntu_xenial
 IMAGE_CALICO_CNI=quay.io/calico/cni:v1.11.2
 IMAGE_CALICO_CTL=quay.io/calico/ctl:v1.6.3
 IMAGE_CALICO_KUBE_CONTROLLERS=quay.io/calico/kube-controllers:v1.0.2