From 76a3839f786572bafdeab17aa4144f54da05e459 Mon Sep 17 00:00:00 2001
From: Ryan Faircloth <rfaircloth@splunk.com>
Date: Fri, 28 Jun 2019 21:11:49 -0400
Subject: [PATCH] path change

---
 .circleci/config.yml | 15 ++++++++++-----
 .idea/workspace.xml  | 10 +++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b97ec3b..7df0e83 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,6 +26,12 @@
       dgoss:
         environment:
           IMAGE_NAME: rfaircloth/scs
+          GOSS_VER: v0.3.6
+          GOSS_DST: ~/bin
+          GOSS_PATH: ~/goss
+          GOSS_OPTS: "--max-concurrent=1 --format junit"
+          GOSS_FILES_STRATEGY: cp
+
         docker:
           - image: circleci/buildpack-deps:stretch
         steps:
@@ -42,16 +48,15 @@
               name: Install goss
               command: |
                 # rather than give internet scripts SU rights, we install to local user bin and add to path
-                mkdir -p ~/bin
-                curl -fsSL https://goss.rocks/install | GOSS_VER=v0.3.6 GOSS_DST=~/bin sh
+                mkdir -p $GOSS_DST
+                mkdir -p $GOSS_PATH
+                curl -fsSL https://goss.rocks/install | sh
           - run:
               name: Test Docker
               command: |
-                export GOSS_OPTS="--max-concurrent=1 --format junit"
-                export GOSS_FILES_STRATEGY=cp
                 mkdir -p ~/project/test-results
                 pushd package
-                GOSS_PATH=~/bin ~/bin/dgoss run -t $IMAGE_NAME:$CIRCLE_SHA1
+                $GOSS_DST/dgoss run -t $IMAGE_NAME:$CIRCLE_SHA1
                 #3>&1 1>&2 2>&3 > /tmp/goss.tmp || true ; cat /tmp/goss.tmp | grep -v "<"
                 popd
                 cat /tmp/goss.tmp | grep "[<\>]" > ~/project/test-results/goss.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7eee3da..812bb89 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -24,8 +24,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/.circleci/config.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="227">
-              <caret line="54" column="17" selection-start-line="54" selection-start-column="17" selection-end-line="54" selection-end-column="17" />
+            <state relative-caret-position="195">
+              <caret line="58" column="25" selection-start-line="58" selection-start-column="25" selection-end-line="58" selection-end-column="25" />
             </state>
           </provider>
         </entry>
@@ -351,7 +351,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="73179000" />
+    <option name="totallyTimeSpent" value="73422000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -599,8 +599,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/.circleci/config.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="227">
-          <caret line="54" column="17" selection-start-line="54" selection-start-column="17" selection-end-line="54" selection-end-column="17" />
+        <state relative-caret-position="195">
+          <caret line="58" column="25" selection-start-line="58" selection-start-column="25" selection-end-line="58" selection-end-column="25" />
         </state>
       </provider>
     </entry>