From 59a1fd8a1c281c897d24fe80bd5ad4cf00e15e31 Mon Sep 17 00:00:00 2001
From: Drew Walters <drewwalters96@gmail.com>
Date: Tue, 21 May 2019 21:27:40 +0000
Subject: [PATCH] airskiff: Use Ubuntu images

Since support for additional operating systems has been added to some
components, the image tag "latest" is no longer used by their Makefiles.
This commit changes the tags for the aforementioned components to use
the new default tag and updates the job name to reflect the use of
Ubuntu images.

Change-Id: Ia1adf156c4b3798b2400f9c821ac2ba685557591
---
 .zuul.yaml                                               | 6 +++---
 site/airskiff/software/charts/ucp/armada/armada.yaml     | 3 +++
 site/airskiff/software/charts/ucp/deckhand/deckhand.yaml | 5 +++++
 site/airskiff/software/charts/ucp/shipyard/shipyard.yaml | 4 ++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 63e7aa6b1..36703a8f2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -21,13 +21,13 @@
         - treasuremap-airship-seaworthy-site-lint
         - treasuremap-airskiff-site-lint
         - treasuremap-airsloop-site-lint
-        - treasuremap-airskiff-deployment
+        - treasuremap-airskiff-deployment-ubuntu
     gate:
       jobs:
         - treasuremap-airship-seaworthy-site-lint
         - treasuremap-airskiff-site-lint
         - treasuremap-airsloop-site-lint
-        - treasuremap-airskiff-deployment
+        - treasuremap-airskiff-deployment-ubuntu
     post:
       jobs:
         - treasuremap-upload-git-mirror
@@ -97,7 +97,7 @@
       - ^site/airskiff/.*$
 
 - job:
-    name: treasuremap-airskiff-deployment
+    name: treasuremap-airskiff-deployment-ubuntu
     nodeset: treasuremap-single-node
     description: |
       Deploy Memcached using Airskiff and latest Treasuremap changes.
diff --git a/site/airskiff/software/charts/ucp/armada/armada.yaml b/site/airskiff/software/charts/ucp/armada/armada.yaml
index e485585c1..c610b2f2b 100644
--- a/site/airskiff/software/charts/ucp/armada/armada.yaml
+++ b/site/airskiff/software/charts/ucp/armada/armada.yaml
@@ -23,6 +23,9 @@ data:
     location: /airship-components/armada
     subpath: charts/armada
   values:
+    images:
+      tags:
+        api: quay.io/airshipit/armada:latest-ubuntu_bionic
     pod:
       replicas:
         api: 1
diff --git a/site/airskiff/software/charts/ucp/deckhand/deckhand.yaml b/site/airskiff/software/charts/ucp/deckhand/deckhand.yaml
index 3f4f97110..b5ecd8eb3 100644
--- a/site/airskiff/software/charts/ucp/deckhand/deckhand.yaml
+++ b/site/airskiff/software/charts/ucp/deckhand/deckhand.yaml
@@ -23,6 +23,11 @@ data:
     location: /airship-components/deckhand
     subpath: charts/deckhand
   values:
+    images:
+      tags:
+        # TODO(drewwalters96): Replace with Ubuntu image once openSUSE image
+        # merges.
+        api: quay.io/airshipit/deckhand:latest
     pod:
       replicas:
         deckhand: 1
diff --git a/site/airskiff/software/charts/ucp/shipyard/shipyard.yaml b/site/airskiff/software/charts/ucp/shipyard/shipyard.yaml
index 631d0b12e..a5840bb0c 100644
--- a/site/airskiff/software/charts/ucp/shipyard/shipyard.yaml
+++ b/site/airskiff/software/charts/ucp/shipyard/shipyard.yaml
@@ -23,6 +23,10 @@ data:
     location: /airship-components/shipyard
     subpath: charts/shipyard
   values:
+    images:
+      tags:
+        airflow: quay.io/airshipit/airflow:latest-ubuntu_xenial
+        shipyard: quay.io/airshipit/shipyard:latest-ubuntu_xenial
     pod:
       replicas:
         shipyard: