Fix circle checkout for tags (apache-spark-on-k8s#352)

Author: robert3005

.circleci/config.yml

@@ -59,6 +59,65 @@ step_templates:
         if [[ -d "$BUILD_SBT_CACHE" ]]; then
           rsync --info=stats2,misc1,flist0 -a --link-dest="$BUILD_SBT_CACHE" "$BUILD_SBT_CACHE/" .
         fi
+  checkout-code: &checkout-code
+    run:
+      name: Checkout code
+      command: |
+        # Copy of circle's checkout command with fix for fetching tags from
+        # https://discuss.circleci.com/t/fetching-circle-tag-doesnt-seem-to-work/19014/2
+
+        # Workaround old docker images with incorrect $HOME
+        # check https://github.com/docker/docker/issues/2968 for details
+        if [ "${HOME}" = "/" ]
+        then
+          export HOME=$(getent passwd $(id -un) | cut -d: -f6)
+        fi
+
+        mkdir -p ~/.ssh
+
+        echo 'github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+        bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==
+        ' >> ~/.ssh/known_hosts
+
+        (umask 077; touch ~/.ssh/id_rsa)
+        chmod 0600 ~/.ssh/id_rsa
+        (cat <<EOF > ~/.ssh/id_rsa
+        $CHECKOUT_KEY
+        EOF
+        )
+
+        # use git+ssh instead of https
+        git config --global url."ssh://[email protected]".insteadOf "https://github.com" || true
+
+        if [ -e /home/circleci/project/.git ]
+        then
+          cd /home/circleci/project
+          git remote set-url origin "$CIRCLE_REPOSITORY_URL" || true
+        else
+          mkdir -p /home/circleci/project
+          cd /home/circleci/project
+          git clone "$CIRCLE_REPOSITORY_URL" .
+        fi
+
+        if [ -n "$CIRCLE_TAG" ]
+        then
+          git fetch origin "+refs/tags/${CIRCLE_TAG}:refs/tags/${CIRCLE_TAG}"
+        else
+          git fetch origin "+${CIRCLE_BRANCH}:remotes/origin/${CIRCLE_BRANCH}"
+        fi
+
+
+        if [ -n "$CIRCLE_TAG" ]
+        then
+          git reset --hard "$CIRCLE_SHA1"
+          git checkout -q "$CIRCLE_TAG"
+        elif [ -n "$CIRCLE_BRANCH" ]
+        then
+          git reset --hard "$CIRCLE_SHA1"
+          git checkout -q -B "$CIRCLE_BRANCH"
+        fi
+
+        git reset --hard "$CIRCLE_SHA1"
 
 jobs:
   build-maven:
@@ -73,7 +132,7 @@ jobs:
             - build-maven-{{ .Branch }}-{{ .BuildNum }}
             - build-maven-{{ .Branch }}-
             - build-maven-master-
-      - checkout
+      - *checkout-code
       - restore_cache:
           keys:
             - maven-dependency-cache-{{ checksum "pom.xml" }}
@@ -110,7 +169,7 @@ jobs:
     <<: *test-defaults
     resource_class: small
     steps:
-      - checkout
+      - *checkout-code
       # Need maven dependency cache, otherwise checkstyle tests fail as such:
       # Failed to execute goal on project spark-assembly_2.11: Could not resolve dependencies for project org.apache.spark:spark-assembly_2.11:pom:2.4.0-SNAPSHOT
       - restore_cache:
@@ -126,7 +185,7 @@ jobs:
     <<: *test-defaults
     resource_class: small
     steps:
-      - checkout
+      - *checkout-code
       - restore_cache:
           key: build-maven-{{ .Branch }}-{{ .BuildNum }}
       - restore_cache:
@@ -147,7 +206,7 @@ jobs:
             - v1-build-sbt-{{ .Branch }}-{{ .Revision }}
             - v1-build-sbt-{{ .Branch }}-
             - v1-build-sbt-master-
-      - checkout
+      - *checkout-code
       - run:
           name: Hard link cache contents into current build directory
           command: |
@@ -197,7 +256,7 @@ jobs:
     # depends on build-sbt
     <<: *defaults
     steps:
-      - checkout
+      - *checkout-code
       - attach_workspace:
           at: .
       - *restore-ivy-cache
@@ -217,7 +276,7 @@ jobs:
       - image: palantirtechnologies/circle-spark-python
     parallelism: 2
     steps:
-      - checkout
+      - *checkout-code
       # These two steps restore all the target directories except jars
       # Necessary because of SPARK_PREPEND_CLASSES being used in python tests, and some python tests
       # accessing classes from the core/test configuration.
@@ -241,7 +300,7 @@ jobs:
     docker:
       - image: palantirtechnologies/circle-spark-r
     steps:
-      - checkout
+      - *checkout-code
       - attach_workspace:
           at: .
       - run:
@@ -262,7 +321,7 @@ jobs:
       - run:
           name: Before running tests, ensure we created the CIRCLE_TEST_REPORTS directory
           command: mkdir -p $CIRCLE_TEST_REPORTS
-      - checkout
+      - *checkout-code
       - attach_workspace:
          at: .
       # These two steps restore all the target directories except jars
@@ -349,7 +408,7 @@ jobs:
     docker:
       - image: palantirtechnologies/circle-spark-r
     steps:
-      - checkout
+      - *checkout-code
       - restore_cache:
           key: maven-dependency-cache-{{ checksum "pom.xml" }}
       - *restore-build-binaries-cache