fix(ci): pull the version of the submodules defined in the repo

This is not necessarily the latest version, which is what `git submodule update --remote` does.
bcgov · Jan 8, 2020 · 3888c3c · 3888c3c
1 parent c6d1851
commit 3888c3c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 26 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -211,10 +211,9 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          name: "Pull Submodules"
+          name: "Checkout Submodules"
           command: |
-            git submodule init
-            git submodule update --remote
+            git submodule update --init
       - run:
           name: start postgres
           command: |
@@ -249,10 +248,9 @@ jobs:
     steps:
       - checkout
       - run:
-          name: "Pull Submodules"
+          name: "Checkout Submodules"
           command: |
-            git submodule init
-            git submodule update --remote
+            git submodule update --init
       - redhat-openshift/create-local-cluster-with-oc:
           skip-registry-check: true
       - redhat-openshift/login-and-update-kubeconfig:
@@ -288,10 +286,9 @@ jobs:
     steps:
       - checkout
       - run:
-          name: "Pull Submodules"
+          name: "Checkout Submodules"
           command: |
-            git submodule init
-            git submodule update --remote
+            git submodule update --init
       - redhat-openshift/login-and-update-kubeconfig:
           insecure-skip-tls-verify: true
           openshift-platform-version: 3.x
@@ -306,10 +303,9 @@ jobs:
     steps:
       - checkout
       - run:
-          name: "Pull Submodules"
+          name: "Checkout Submodules"
           command: |
-            git submodule init
-            git submodule update --remote
+            git submodule update --init
       - redhat-openshift/login-and-update-kubeconfig:
           insecure-skip-tls-verify: true
           openshift-platform-version: 3.x
@@ -324,10 +320,9 @@ jobs:
     steps:
       - checkout
       - run:
-          name: "Pull Submodules"
+          name: "Checkout Submodules"
           command: |
-            git submodule init
-            git submodule update --remote
+            git submodule update --init
       - redhat-openshift/login-and-update-kubeconfig:
           insecure-skip-tls-verify: true
           openshift-platform-version: 3.x
@@ -342,10 +337,9 @@ jobs:
     steps:
       - checkout
       - run:
-          name: "Pull Submodules"
+          name: "Checkout Submodules"
           command: |
-            git submodule init
-            git submodule update --remote
+            git submodule update --init
       - redhat-openshift/login-and-update-kubeconfig:
           insecure-skip-tls-verify: true
           openshift-platform-version: 3.x
@@ -360,10 +354,9 @@ jobs:
     steps:
       - checkout
       - run:
-          name: "Pull Submodules"
+          name: "Checkout Submodules"
           command: |
-            git submodule init
-            git submodule update --remote
+            git submodule update --init
       - redhat-openshift/login-and-update-kubeconfig:
           insecure-skip-tls-verify: true
           openshift-platform-version: 3.x
@@ -381,10 +374,9 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          name: "Pull Submodules"
+          name: "Checkout Submodules"
           command: |
-            git submodule init
-            git submodule update --remote
+            git submodule update --init
       - run:
           name: start postgres
           command: |

diff --git a/shipit.yml b/shipit.yml
@@ -2,8 +2,7 @@ dependencies:
   override: []
 deploy:
   override:
-    - git submodule init
-    - git submodule update --remote
+    - git submodule update --init
     - make install
 review:
   checklist: []