switching keys

Shippable · Jan 5, 2018 · 74ae7d9 · 74ae7d9
1 parent 0e7dd17
commit 74ae7d9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/archiveProvisionState.sh b/archiveProvisionState.sh
@@ -5,7 +5,7 @@ export PROV_ENV=$2
 export TF_FOLDER="$PROV_CONTEXT-$PROV_ENV"
 export RES_STATE=$PROV_CONTEXT"_"$PROV_ENV"_state"
 
-export RES_REPO="infra_repo"
+export RES_REPO="inf_repo"
 export RES_REPO_UP=$(echo $RES_REPO | awk '{print toupper($0)}')
 export RES_REPO_STATE=$(eval echo "$"$RES_REPO_UP"_STATE") #loc of git repo clone
 

diff --git a/plan.sh b/plan.sh
@@ -4,7 +4,7 @@ export PROV_CONTEXT=$1
 export PROV_ENV=$2
 export TF_FOLDER="$PROV_CONTEXT-$PROV_ENV"
 
-export RES_REPO="infra_repo"
+export RES_REPO="inf_repo"
 export RES_AWS_CREDS="aws_v2_"$PROV_CONTEXT"_access"
 export RES_AWS_PEM="aws_"$PROV_CONTEXT"_pem"
 export KEY_FILE_NAME=$PROV_CONTEXT"-us-east-1.pem"

diff --git a/provision.sh b/provision.sh
@@ -5,7 +5,7 @@ export PROV_ENV=$2
 export TF_FOLDER="$PROV_CONTEXT-$PROV_ENV"
 export RES_STATE=$PROV_CONTEXT"_"$PROV_ENV"_state"
 
-export RES_REPO="infra_repo"
+export RES_REPO="inf_repo"
 #export RES_AWS_CREDS="aws_v2_"$PROV_CONTEXT"_access"
 #export RES_AWS_PEM="aws_"$PROV_CONTEXT"_pem"
 export RES_AWS_CREDS=$PROV_CONTEXT"_aws_key"

diff --git a/shippable.yml b/shippable.yml
@@ -1,4 +1,11 @@
 resources:
+  - name: inf_repo
+    type: gitRepo
+    integration: "ric03uec-github"
+    pointer:
+      sourceName: "Shippable/infra"
+      branch: master
+
   - name: rc_saas_state
     type: state
 
@@ -35,11 +42,11 @@ jobs:
         switch: off
       - IN: rc_saas_state
         switch: off
-      - IN: infra_repo
+      - IN: inf_repo
         switch: off
       - TASK:
           script:
-            - pushd $(shipctl get_resource_state "infra_repo")
+            - pushd $(shipctl get_resource_state "inf_repo")
             - ./provision.sh rc saas
             - popd
       - OUT: rc_saas_state
@@ -48,7 +55,7 @@ jobs:
     on_failure:
       - script: echo 'FAILURE!'
     always:
-      - script: /build/IN/infra_repo/gitRepo/archiveProvisionState.sh rc saas
+      - script: /build/IN/inf_repo/gitRepo/archiveProvisionState.sh rc saas
 
   - name: prod_saas_inf_prov
     type: runSh
@@ -59,11 +66,11 @@ jobs:
         switch: off
       - IN: prod_saas_state
         switch: off
-      - IN: infra_repo
+      - IN: inf_repo
         switch: off
       - TASK:
           script:
-            - pushd $(shipctl get_resource_state "infra_repo")
+            - pushd $(shipctl get_resource_state "inf_repo")
             - ./provision.sh prod saas
             - popd
       - OUT: prod_saas_state
@@ -72,4 +79,4 @@ jobs:
     on_failure:
       - script: echo 'FAILURE!'
     always:
-      - script: /build/IN/infra_repo/gitRepo/archiveProvisionState.sh prod saas
+      - script: /build/IN/inf_repo/gitRepo/archiveProvisionState.sh prod saas