diff --git a/.travis.yml b/.travis.yml index eefd0d119..213c0ab9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,12 @@ before_install: - sleep 3 - . ./scripts/ci/job_hooks/before_install.sh +install: ./scripts/install.sh + stages: - name: Quality and Unit tests + - name: Update Rancher + if: (type = push AND tag IS blank) OR type = api - name: e2e jobs: @@ -84,6 +88,10 @@ jobs: script: ng run app-e2e:e2elite --suite "viewer,infoDrawer,extensions" after_script: ./start.sh -d + - stage: Update Rancher + name: Update Rancher + script: ./scripts/travis/deploy/deploy.sh + - stage: Trigger DW if: (branch = master OR branch = development OR (tag =~ .*beta.*)) AND type = push script: ./scripts/trigger-travis.sh --pro --branch $TRAVIS_BRANCH Alfresco digital-workspace $TRAVIS_ACCESS_TOKEN diff --git a/package.json b/package.json index e1cca0958..a0a7ac086 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,6 @@ "@alfresco/adf-content-services": "3.8.0-beta9", "@alfresco/adf-core": "3.8.0-beta9", "@alfresco/adf-extensions": "3.8.0-beta9", - "@alfresco/adf-testing": "3.8.0-83e362d31a737200bc9251e9505137f198509d2f", "@alfresco/js-api": "3.8.0-beta9", "@angular-custom-builders/lite-serve": "0.0.2", "@angular/animations": "7.2.15", @@ -75,6 +74,7 @@ "zone.js": "0.8.29" }, "devDependencies": { + "@alfresco/adf-testing": "3.8.0-83e362d31a737200bc9251e9505137f198509d2f", "@angular-devkit/build-angular": "~0.13.9", "@angular-devkit/build-ng-packagr": "^0.13.10", "@angular/cli": "^7.3.9", diff --git a/scripts/install.sh b/scripts/install.sh new file mode 100755 index 000000000..a5f3af8d7 --- /dev/null +++ b/scripts/install.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +if [ "${TRAVIS_BRANCH}" != "master" ]; then + ./scripts/update-version.sh -v alpha +fi diff --git a/scripts/travis/deploy/deploy.sh b/scripts/travis/deploy/deploy.sh new file mode 100755 index 000000000..3247a4f1f --- /dev/null +++ b/scripts/travis/deploy/deploy.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +cd $DIR/../../../ + +# Get Tag Image +TAG_VERSION=$(./scripts/travis/deploy/get-docker-image-tag-name.sh) +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/get-docker-image-tag-name.sh b/scripts/travis/deploy/get-docker-image-tag-name.sh new file mode 100755 index 000000000..46d8d7991 --- /dev/null +++ b/scripts/travis/deploy/get-docker-image-tag-name.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +if [[ $TRAVIS_BRANCH == "master" ]]; then + TAG_VERSION=$(grep -m1 version package.json | awk '{ print $2 }' | sed 's/[", ]//g') +else + TAG_VERSION=$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER +fi; + +echo $TAG_VERSION; diff --git a/scripts/rancher-update.sh b/scripts/travis/deploy/rancher-update.sh similarity index 100% rename from scripts/rancher-update.sh rename to scripts/travis/deploy/rancher-update.sh diff --git a/scripts/update-version.sh b/scripts/update-version.sh index a0946bfad..3826dae73 100755 --- a/scripts/update-version.sh +++ b/scripts/update-version.sh @@ -5,6 +5,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" eval libs=( "@alfresco/adf-core" "@alfresco/adf-content-services" "@alfresco/adf-extensions" + "@alfresco/adf-testing" "@alfresco/js-api" )