From 9e9137525e8e03d229a00bad07fc4f535f0239d5 Mon Sep 17 00:00:00 2001
From: Suraj Deshmukh <suraj@kinvolk.io>
Date: Tue, 24 Mar 2020 18:24:35 +0530
Subject: [PATCH] ci Packet: Change the order of component installation

Install components in following order, mandatorily, to ensure that other
components can install Prometheus Operator CRs like ServiceMonitor and
PrometheusRule:

- OpenEBS
- OpenEBS Storage Class
- Prometheus Operator

Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
---
 ci/packet/packet-cluster.lokocfg.envsubst | 32 +++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/ci/packet/packet-cluster.lokocfg.envsubst b/ci/packet/packet-cluster.lokocfg.envsubst
index ca52a54ad..612f9e1b5 100644
--- a/ci/packet/packet-cluster.lokocfg.envsubst
+++ b/ci/packet/packet-cluster.lokocfg.envsubst
@@ -30,6 +30,22 @@ cluster "packet" {
 
 component "openebs-operator" {}
 
+# openebs-storage-class component should always be the last to be installed
+# pending when https://github.com/kinvolk/lokoctl/issues/374 is fixed
+# because when the discovery failure for creating StoragePoolClaim happens,
+# lokoctl install errors out and moves on with running the tests
+# causing subsequent components below this to be skipped.
+component "openebs-storage-class" {
+  storage-class "openebs-test-sc" {
+    replica_count = 1
+    default = true
+  }
+}
+
+component "prometheus-operator" {
+  grafana_admin_password = "admin"
+}
+
 component "contour" {
   ingress_hosts   = ["dex.$CLUSTER_ID.$AWS_DNS_ZONE","gangway.$CLUSTER_ID.$AWS_DNS_ZONE"]
   service_monitor = true
@@ -119,22 +135,6 @@ component "rook" {}
 
 component "flatcar-linux-update-operator" {}
 
-# openebs-storage-class component should always be the last to be installed
-# pending when https://github.com/kinvolk/lokoctl/issues/374 is fixed
-# because when the discovery failure for creating StoragePoolClaim happens,
-# lokoctl install errors out and moves on with running the tests
-# causing subsequent components below this to be skipped.
-component "openebs-storage-class" {
-  storage-class "openebs-test-sc" {
-    replica_count = 1
-    default = true
-  }
-}
-
-component "prometheus-operator" {
-  grafana_admin_password = "admin"
-}
-
 component "cluster-autoscaler" {
   cluster_name = "$CLUSTER_ID"