From d86d00f5f2ebb031178e46f08cbbc0ed9a20ce58 Mon Sep 17 00:00:00 2001
From: Arie Peterson <arie@greenhost.nl>
Date: Wed, 11 Dec 2019 16:14:16 +0100
Subject: [PATCH] Remove separate CI job for installing apps

---
 .gitlab-ci.yml | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c4e618bf..edaa7fe8d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,27 +69,7 @@ setup-kubernetes:
     - cp clusters/${CI_COMMIT_REF_SLUG}/inventory.yml ansible/
     - cp clusters/${CI_COMMIT_REF_SLUG}/settings.yml ansible/group_vars/all/
     # Set up cluster
-    - python3 -m openappstack $HOSTNAME install --ansible-param='--skip-tags=helmfile'
-  artifacts:
-    paths:
-    - ./clusters
-    - ansible/inventory.yml
-    - ansible/group_vars/all/settings.yml
-    expire_in: 1 month
-    when: always
-  only:
-    changes:
-      - .gitlab-ci.yml
-      - ansible/**/*
-      - helmfiles/**/*
-      - test/**/*
-      - openappstack/**/*
-  extends: .ssh_setup
-
-install:
-  stage: install-apps
-  script:
-    - python3 -m openappstack $HOSTNAME install --ansible-param='--tags=helmfile'
+    - python3 -m openappstack $HOSTNAME install
     # Show versions of installed apps/binaries
     - chmod 700 ansible
     - cd ansible
@@ -105,7 +85,7 @@ install:
     changes:
       - .gitlab-ci.yml
       - ansible/**/*
-      - helmfiles/**/*
+      - flux/**/*
       - test/**/*
       - openappstack/**/*
   extends: .ssh_setup
-- 
GitLab