mirror of
https://github.com/balena-os/balena-supervisor.git
synced 2025-01-01 11:36:42 +00:00
Merge pull request #297 from resin-io/remove-unused-build
Remove unused Jenkins build step
This commit is contained in:
commit
d165097822
@ -2,7 +2,6 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
# Jenkins build steps
|
# Jenkins build steps
|
||||||
VERSION=$(git describe --always --abbrev=6)
|
|
||||||
ESCAPED_BRANCH_NAME=$(echo $sourceBranch | sed 's/[^a-z0-9A-Z_.-]/-/g')
|
ESCAPED_BRANCH_NAME=$(echo $sourceBranch | sed 's/[^a-z0-9A-Z_.-]/-/g')
|
||||||
|
|
||||||
# Try pulling the old build first for caching purposes.
|
# Try pulling the old build first for caching purposes.
|
||||||
@ -12,15 +11,15 @@ docker pull registry.resinstaging.io/resin/node-supervisor-${ARCH}:${ESCAPED_BRA
|
|||||||
docker pull registry.resinstaging.io/resin/go-supervisor-${ARCH}:${ESCAPED_BRANCH_NAME} || docker pull registry.resinstaging.io/resin/go-supervisor-${ARCH}:master || true
|
docker pull registry.resinstaging.io/resin/go-supervisor-${ARCH}:${ESCAPED_BRANCH_NAME} || docker pull registry.resinstaging.io/resin/go-supervisor-${ARCH}:master || true
|
||||||
|
|
||||||
# Test the gosuper
|
# Test the gosuper
|
||||||
make SUPERVISOR_VERSION=${VERSION} JOB_NAME=${JOB_NAME} test-gosuper
|
make SUPERVISOR_VERSION=${ESCAPED_BRANCH_NAME} JOB_NAME=${JOB_NAME} test-gosuper
|
||||||
|
|
||||||
MAKE_ARGS="ARCH=${ARCH} \
|
MAKE_ARGS="ARCH=${ARCH} \
|
||||||
PUBNUB_SUBSCRIBE_KEY=${PUBNUB_SUBSCRIBE_KEY} \
|
PUBNUB_SUBSCRIBE_KEY=${PUBNUB_SUBSCRIBE_KEY} \
|
||||||
PUBNUB_PUBLISH_KEY=${PUBNUB_PUBLISH_KEY} \
|
PUBNUB_PUBLISH_KEY=${PUBNUB_PUBLISH_KEY} \
|
||||||
MIXPANEL_TOKEN=${MIXPANEL_TOKEN}"
|
MIXPANEL_TOKEN=${MIXPANEL_TOKEN} \
|
||||||
|
SUPERVISOR_VERSION=${ESCAPED_BRANCH_NAME}"
|
||||||
|
|
||||||
make ${MAKE_ARGS} \
|
make ${MAKE_ARGS} \
|
||||||
SUPERVISOR_VERSION=${ESCAPED_BRANCH_NAME} \
|
|
||||||
DEPLOY_REGISTRY= \
|
DEPLOY_REGISTRY= \
|
||||||
deploy
|
deploy
|
||||||
|
|
||||||
@ -31,16 +30,6 @@ docker push registry.resinstaging.io/resin/node-supervisor-${ARCH}:${ESCAPED_BRA
|
|||||||
docker push registry.resinstaging.io/resin/go-supervisor-${ARCH}:${ESCAPED_BRANCH_NAME} || true
|
docker push registry.resinstaging.io/resin/go-supervisor-${ARCH}:${ESCAPED_BRANCH_NAME} || true
|
||||||
|
|
||||||
make ${MAKE_ARGS} \
|
make ${MAKE_ARGS} \
|
||||||
SUPERVISOR_VERSION=${VERSION} \
|
|
||||||
DEPLOY_REGISTRY= \
|
|
||||||
deploy
|
|
||||||
|
|
||||||
make ${MAKE_ARGS} \
|
|
||||||
SUPERVISOR_VERSION=${ESCAPED_BRANCH_NAME} \
|
|
||||||
DEPLOY_REGISTRY=registry.resinstaging.io/ \
|
DEPLOY_REGISTRY=registry.resinstaging.io/ \
|
||||||
deploy
|
deploy
|
||||||
|
|
||||||
make ${MAKE_ARGS} \
|
|
||||||
SUPERVISOR_VERSION=${VERSION} \
|
|
||||||
DEPLOY_REGISTRY=registry.resinstaging.io/ \
|
|
||||||
deploy
|
|
||||||
|
Loading…
Reference in New Issue
Block a user