From c8881f5aa42c4c1e5146ca6e3d6d946c89a62d0b Mon Sep 17 00:00:00 2001
From: Abhishek <abhishek@linux.com>
Date: Wed, 10 May 2017 18:15:23 +0530
Subject: [PATCH] update created artifacts for k8s and openshift update created
 artifacts for kubernetes and openshift so that env variables are populated in
 a particular order

---
 script/test/fixtures/etherpad/output-k8s.json |  8 +++----
 .../test/fixtures/gitlab/docker-compose.yml   |  2 +-
 script/test/fixtures/gitlab/output-k8s.json   | 16 ++++++-------
 .../fixtures/keyonly-envs/output-k8s.json     | 24 +++++++++----------
 .../multiple-compose-files/output-k8s.json    | 16 ++++++-------
 .../output-openshift.json                     | 16 ++++++-------
 6 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/script/test/fixtures/etherpad/output-k8s.json b/script/test/fixtures/etherpad/output-k8s.json
index 8af68c9a..aa51114e 100644
--- a/script/test/fixtures/etherpad/output-k8s.json
+++ b/script/test/fixtures/etherpad/output-k8s.json
@@ -85,10 +85,6 @@
                   }
                 ],
                 "env": [
-                  {
-                    "name": "DB_USER",
-                    "value": "etherpad"
-                  },
                   {
                     "name": "DB_DBID",
                     "value": "etherpad"
@@ -104,6 +100,10 @@
                   {
                     "name": "DB_PORT",
                     "value": "3306"
+                  },
+                  {
+                    "name": "DB_USER",
+                    "value": "etherpad"
                   }
                 ],
                 "resources": {}
diff --git a/script/test/fixtures/gitlab/docker-compose.yml b/script/test/fixtures/gitlab/docker-compose.yml
index 602db296..9e9512db 100644
--- a/script/test/fixtures/gitlab/docker-compose.yml
+++ b/script/test/fixtures/gitlab/docker-compose.yml
@@ -30,4 +30,4 @@ services:
   redis:
     image: swordphilic/redis
     ports:
-      - "$REDIS_PORT"
+      - $REDIS_PORT
diff --git a/script/test/fixtures/gitlab/output-k8s.json b/script/test/fixtures/gitlab/output-k8s.json
index 386875c0..96422418 100644
--- a/script/test/fixtures/gitlab/output-k8s.json
+++ b/script/test/fixtures/gitlab/output-k8s.json
@@ -127,10 +127,6 @@
                   }
                 ],
                 "env": [
-                  {
-                    "name": "REDIS_PORT",
-                    "value": "6379"
-                  },
                   {
                     "name": "DB_HOST",
                     "value": "postgresql"
@@ -158,6 +154,10 @@
                   {
                     "name": "REDIS_HOST",
                     "value": "redis"
+                  },
+                  {
+                    "name": "REDIS_PORT",
+                    "value": "6379"
                   }
                 ],
                 "resources": {}
@@ -200,10 +200,6 @@
                   }
                 ],
                 "env": [
-                  {
-                    "name": "DB_USER",
-                    "value": "gitlab"
-                  },
                   {
                     "name": "DB_NAME",
                     "value": "gitlab"
@@ -211,6 +207,10 @@
                   {
                     "name": "DB_PASS",
                     "value": "gitlab"
+                  },
+                  {
+                    "name": "DB_USER",
+                    "value": "gitlab"
                   }
                 ],
                 "resources": {}
diff --git a/script/test/fixtures/keyonly-envs/output-k8s.json b/script/test/fixtures/keyonly-envs/output-k8s.json
index 9b60c84e..b4a2032c 100644
--- a/script/test/fixtures/keyonly-envs/output-k8s.json
+++ b/script/test/fixtures/keyonly-envs/output-k8s.json
@@ -111,14 +111,6 @@
                   }
                 ],
                 "env": [
-                  {
-                    "name": "SESSION_SECRET",
-                    "value": "session"
-                  },
-                  {
-                    "name": "SHOW",
-                    "value": "true"
-                  },
                   {
                     "name": "GET_HOSTS_FROM",
                     "value": "dns"
@@ -126,6 +118,14 @@
                   {
                     "name": "RACK_ENV",
                     "value": "development"
+                  },
+                  {
+                    "name": "SESSION_SECRET",
+                    "value": "session"
+                  },
+                  {
+                    "name": "SHOW",
+                    "value": "true"
                   }
                 ],
                 "resources": {}
@@ -215,13 +215,13 @@
                     "name": "RACK_ENV",
                     "value": "development"
                   },
-                  {
-                    "name": "SHOW",
-                    "value": "true"
-                  },
                   {
                     "name": "SESSION_SECRET",
                     "value": "session"
+                  },
+                  {
+                    "name": "SHOW",
+                    "value": "true"
                   }
                 ],
                 "resources": {}
diff --git a/script/test/fixtures/multiple-compose-files/output-k8s.json b/script/test/fixtures/multiple-compose-files/output-k8s.json
index af03e694..70efde38 100644
--- a/script/test/fixtures/multiple-compose-files/output-k8s.json
+++ b/script/test/fixtures/multiple-compose-files/output-k8s.json
@@ -176,14 +176,6 @@
                   }
                 ],
                 "env": [
-                  {
-                    "name": "MYSQL_ROOT_PASSWORD",
-                    "value": "openshift"
-                  },
-                  {
-                    "name": "MYSQL_USER",
-                    "value": "openshift"
-                  },
                   {
                     "name": "MYSQL_DATABASE",
                     "value": "openshift"
@@ -191,6 +183,14 @@
                   {
                     "name": "MYSQL_PASSWORD",
                     "value": "openshift"
+                  },
+                  {
+                    "name": "MYSQL_ROOT_PASSWORD",
+                    "value": "openshift"
+                  },
+                  {
+                    "name": "MYSQL_USER",
+                    "value": "openshift"
                   }
                 ],
                 "resources": {},
diff --git a/script/test/fixtures/multiple-compose-files/output-openshift.json b/script/test/fixtures/multiple-compose-files/output-openshift.json
index fb7b35a1..ce2b3ee3 100644
--- a/script/test/fixtures/multiple-compose-files/output-openshift.json
+++ b/script/test/fixtures/multiple-compose-files/output-openshift.json
@@ -123,6 +123,10 @@
                   }
                 ],
                 "env": [
+                  {
+                    "name": "DB_DBID",
+                    "value": "openshift"
+                  },
                   {
                     "name": "DB_HOST",
                     "value": "openshift"
@@ -138,10 +142,6 @@
                   {
                     "name": "DB_USER",
                     "value": "openshift"
-                  },
-                  {
-                    "name": "DB_DBID",
-                    "value": "openshift"
                   }
                 ],
                 "resources": {}
@@ -254,10 +254,6 @@
                   }
                 ],
                 "env": [
-                  {
-                    "name": "MYSQL_USER",
-                    "value": "openshift"
-                  },
                   {
                     "name": "MYSQL_DATABASE",
                     "value": "openshift"
@@ -269,6 +265,10 @@
                   {
                     "name": "MYSQL_ROOT_PASSWORD",
                     "value": "openshift"
+                  },
+                  {
+                    "name": "MYSQL_USER",
+                    "value": "openshift"
                   }
                 ],
                 "resources": {},