diff --git a/.travis.yml b/.travis.yml index 7ffba1420..de0e24544 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: echo "no install" stages: - name: Quality and Unit tests - - name: Update Rancher + - name: Publish Docker Registry if: (type = push AND tag IS blank) OR type = api - name: Release Libraries if: branch = master AND type = push @@ -126,9 +126,9 @@ jobs: after_script: - ./scripts/ci/job_hooks/after_e2e.sh - - stage: Update Rancher - name: Update Rancher - script: ./scripts/travis/deploy/deploy.sh + - stage: Publish Docker Registry + name: Publish Docker Registry + script: ./scripts/travis/deploy/publish.sh - stage: Release Tag script: ./scripts/travis/release/git-tag.sh diff --git a/scripts/travis/deploy/deploy.sh b/scripts/travis/deploy/publish.sh similarity index 62% rename from scripts/travis/deploy/deploy.sh rename to scripts/travis/deploy/publish.sh index 14f361e5d..f9fd87e19 100755 --- a/scripts/travis/deploy/deploy.sh +++ b/scripts/travis/deploy/publish.sh @@ -12,8 +12,3 @@ echo "Running the docker with tag" $TAG_VERSION # Publish Image to docker ./node_modules/@alfresco/adf-cli/bin/adf-cli docker-publish --loginCheck --loginUsername "$DOCKER_REPOSITORY_USER" --loginPassword "$DOCKER_REPOSITORY_PASSWORD" --loginRepo "$DOCKER_REPOSITORY_DOMAIN" --dockerRepo "$DOCKER_REPOSITORY" --dockerTags "$TAG_VERSION,$TRAVIS_BRANCH" --pathProject "$(pwd)" - -echo "Update rancher with docker tag" $TAG_VERSION --url $REPO_RANCHER --environment_name $REPO_RANCHER_NAME - -# Deploy PR in Rancher env -./scripts/travis/deploy/rancher-update.sh --access_key $RANCHER_TOKEN --secret_key $RANCHER_SECRET --url $REPO_RANCHER --environment_name $REPO_RANCHER_NAME --image docker:$DOCKER_REPOSITORY:$TAG_VERSION diff --git a/scripts/travis/deploy/rancher-update.sh b/scripts/travis/deploy/rancher-update.sh deleted file mode 100755 index a2adaff88..000000000 --- a/scripts/travis/deploy/rancher-update.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash - -show_help() { - echo "Usage: docker_publish.sh" - echo "" - echo "--access_key rancher access key" - echo "--secret_key rancher secret key" - echo "--url rancher_url" - echo "--environment_name service name to replace in rancher" - echo "--image image to gater and load in the service, example: docker:alfresco/demo-shell:latest" -} - -access_key(){ - ACCESSKEY=$1 -} - -secret_key(){ - SECRETKEY=$1 -} - -url(){ - RANCHERURL=$1 -} - -environment_name(){ - ENVIRONMENTNAME=$1 -} - -image_name(){ - IMAGE=$1 -} - -while [[ $1 == -* ]]; do - case "$1" in - -h|--help|-\?) show_help; exit 0;; - --access_key) access_key $2; shift 2;; - --secret_key) secret_key $2; shift 2;; - --url) url $2; shift 2;; - --environment_name) environment_name $2; shift 2;; - --image) image_name $2; shift 2;; - -*) echo "invalid option: $1" 1>&2; show_help; exit 1;; - esac -done - -docker pull etlweather/gaucho:alpine - -docker=$(which docker) - -echo "getting the id" - -ENVIRONMENTID=$($docker run --rm -e CATTLE_ACCESS_KEY=$ACCESSKEY \ - -e CATTLE_SECRET_KEY=$SECRETKEY \ - -e CATTLE_URL=$RANCHERURL \ - etlweather/gaucho:alpine id_of $ENVIRONMENTNAME) - -echo "id retrieved! is ${environment_id}" - -$docker run --rm -e CATTLE_ACCESS_KEY=$ACCESSKEY \ - -e CATTLE_SECRET_KEY=$SECRETKEY \ - -e CATTLE_URL=$RANCHERURL \ - etlweather/gaucho:alpine upgrade $ENVIRONMENTID --imageUuid $IMAGE --auto_complete true --timeout 600