Merge pull request #59 from oracle/update-build-process

Include hack directory in build output. Allow version to be configured
oracle · Mar 22, 2018 · d85abc0 · d85abc0
2 parents 8611526 + 7f9147c
commit d85abc0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 49 deletions.
diff --git a/Makefile b/Makefile
@@ -17,12 +17,12 @@ USE_GLOBAL_NAMESPACE ?= false
 ifdef WERCKER
     # Insert swear words about mysql group replication and hostname length. Arghh..
     NEW_NAMESPACE ?= e2e-$(shell echo ${WERCKER_GIT_COMMIT} | fold -w 8 | head -n1)
-    VERSION := ${WERCKER_GIT_COMMIT}
+    VERSION ?= ${WERCKER_GIT_COMMIT}
     E2E_FUNC := e2efunc-wercker
     E2E_NON_BUFFERED_LOGS ?= false
 else
     NEW_NAMESPACE ?= e2e-${USER}
-    VERSION := ${USER}-$(shell  date +%Y%m%d%H%M%S)
+    VERSION ?= ${USER}-$(shell date +%Y%m%d%H%M%S)
     E2E_FUNC := e2efunc-docker
     E2E_NON_BUFFERED_LOGS ?= true
 endif

diff --git a/hack/release.sh b/hack/release.sh
diff --git a/wercker.yml b/wercker.yml
@@ -31,6 +31,7 @@ build:
         cp -R pkg ${WERCKER_OUTPUT_DIR}/
         cp -R test ${WERCKER_OUTPUT_DIR}/
         cp -R vendor ${WERCKER_OUTPUT_DIR}/
+        cp -R hack ${WERCKER_OUTPUT_DIR}/
         cp -R mysql-operator ${WERCKER_OUTPUT_DIR}/
         cp -R .git ${WERCKER_OUTPUT_DIR}/
 
@@ -106,7 +107,7 @@ e2e-test-upgrade:
         fi
         E2E_NON_BUFFERED_LOGS=true make e2e-suite-run-upgrade
         make e2e-suite-teardown-upgrade
-        
+
 release:
   box:
     id: oraclelinux:7-slim
@@ -120,4 +121,4 @@ release:
       token: $GITHUB_TOKEN
       tag: $VERSION
       title: $VERSION
-      draft: false       
+      draft: false