From 19c2b1e2996132518602a03422fa874976b894a9 Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Wed, 2 Oct 2019 16:29:09 -0500 Subject: [PATCH] CI: Build image after Docker installed in airskiff The airskiff pipeline attempts to build the Armada Docker image before Docker is installed. This change moves the order of the airskiff pipeline tasks to build the Armada image AFTER Docker has been installed by the OpenStack-Helm minikube script. Change-Id: I3d531213c4787b7bbbc875a0257738a299359b1f Signed-off-by: Drew Walters --- tools/gate/playbooks/airskiff-deploy.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/gate/playbooks/airskiff-deploy.yaml b/tools/gate/playbooks/airskiff-deploy.yaml index 850403ba..164a9491 100644 --- a/tools/gate/playbooks/airskiff-deploy.yaml +++ b/tools/gate/playbooks/airskiff-deploy.yaml @@ -21,13 +21,6 @@ args: chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - - name: Build Armada with submitted changes - shell: | - make images - args: - chdir: "{{ zuul.project.src_dir }}" - become: yes - - name: Deploy Kubernetes with Minikube shell: | ./tools/deployment/airskiff/developer/010-deploy-k8s.sh @@ -41,6 +34,13 @@ chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" become: yes + - name: Build Armada with submitted changes + shell: | + make images + args: + chdir: "{{ zuul.project.src_dir }}" + become: yes + - name: Deploy Airship components using Armada shell: | mkdir ~/.kube