fix: git tags on CI and improved dev targets (#88)

* fix: targets for CI and dev

- On Travis, we use minikube with driver=none.
- So the host docker is the one used by minikube.
- So building images on the host is automatically available to kubernetes.
- So we can deploy the chart without uploading anything.

Signed-off-by: Thulio Ferraz Assis <[email protected]>

* fix: tags not being fetched on CI

Signed-off-by: Thulio Ferraz Assis <[email protected]>

* fix: move git fetch logic to version.sh

Signed-off-by: Thulio Ferraz Assis <[email protected]>

* fix: env to force fetching of tags and unshallow

When a repository is shallow-cloned, sometimes the tags are too old to
trace back to a commit, making 'git describe --tags' fail.

If VERSION_FORCE_TAG_FETCH environment variable is set, version.sh will
fetch all the tags and unshallow the repository. This is useful for CI,
where it shallow-cones the repository by default.

Signed-off-by: Thulio Ferraz Assis <[email protected]>

Author: Thulio Ferraz Assis

.travis.yml

@@ -36,6 +36,8 @@ jobs:
     - TEST_PROVISION_TIMEOUT=5m
     - TEST_BIND_TIMEOUT=5m
     - TEST_ASSERT_TIMEOUT=2m
+    # Forces the version.sh script to fetch tags and unshallow the git repository.
+    - VERSION_FORCE_TAG_FETCH=true
     before_install:
     - sudo apt-get -qq -y install conntrack
     before_script:
@@ -46,6 +48,9 @@ jobs:
     stage: release
     services:
     - docker
+    env:
+    # Forces the version.sh script to fetch tags and unshallow the git repository.
+    - VERSION_FORCE_TAG_FETCH=true
     before_script:
     - ci/install/release.sh
     script: ci/release.sh

Makefile

@@ -93,13 +93,15 @@ log:
 create-cluster:
 	./hack/create-cluster.sh
 
-deploy: image-in-minikube charts
+deploy:
 	IMAGE="$(IMAGE)" \
 	TAG="$(TAG)" \
 	IMAGE_PULL_POLICY="$(IMAGE_PULL_POLICY)" \
 	OUTPUT_CHARTS_DIR="$(OUTPUT_CHARTS_DIR)" \
 	./build/deploy.sh
 
+deploy-dev: image-in-minikube charts deploy
+
 release: clean release-images release-charts
 
 release-images: image

build/version.sh

@@ -16,7 +16,20 @@
 
 set -o errexit -o nounset -o pipefail
 
+if [ -z "$(git tag --list)" ]; then
+    if [ -n "${VERSION_FORCE_TAG_FETCH:-}" ]; then
+        >&2 echo "fetching git tags"
+        git fetch --tags --all 1> /dev/null 2> /dev/null
+        >&2 echo "unshallowing git repository"
+        git fetch --unshallow 1> /dev/null 2> /dev/null
+    else
+        >&2 echo "failed to fetch git tags"
+        exit 1
+    fi
+fi
+
 git_tag=$(git describe --tags)
+
 # This dirty check also takes into consideration new files not staged for
 # commit.
 git_dirty=$([[ -z "$(git status --short)" ]] || echo "-dirty")

ci/test_integration.sh

@@ -18,5 +18,7 @@ set -o errexit -o nounset -o pipefail
 
 VM_DRIVER=none sudo timeout 3m make create-cluster
 timeout 1m kubectl create namespace minibroker-tests
-timeout 10m make deploy
+timeout 10m make image
+timeout 1m make charts
+timeout 3m make deploy
 timeout 8m make test-integration