diff --git a/.travis.yml b/.travis.yml index e2e3cab5e..b0b586688 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,13 +25,13 @@ install: echo "no install" stages: - name: Quality and Unit tests - if: branch = develop AND type = cron + if: type = cron || type = pull_request - name: Publish Docker Registry - if: (branch = develop AND type = cron) || (branch = master AND type = push) + if: type = push - name: Release Tag if: branch = master AND type = push - name: e2e - if: branch != master AND (type = cron || type = pull_request) AND tag IS blank + if: type = cron || type = pull_request - name: Trigger DW if: branch = develop AND type = cron diff --git a/scripts/travis/deploy/publish.sh b/scripts/travis/deploy/publish.sh index 3f337946c..1a5ff7e49 100755 --- a/scripts/travis/deploy/publish.sh +++ b/scripts/travis/deploy/publish.sh @@ -10,7 +10,7 @@ npm run build.release TAG_VERSION=$(./scripts/travis/deploy/get-docker-image-tag-name.sh) echo "Running the docker with tag" $TAG_VERSION DOCKER_PROJECT_ARGS="PROJECT_NAME=$PROJECT_AFFECTED" - +DOCKER_REPOSITORY="$DOCKER_REPOSITORY_DOMAIN/$REPO_SLUG" # Publish Image to docker echo "npx @lfresco/adf-cli docker-publish --loginCheck --loginUsername '$DOCKER_REPOSITORY_USER' --loginPassword '$DOCKER_REPOSITORY_PASSWORD' --loginRepo '$DOCKER_REPOSITORY_DOMAIN' --dockerRepo '$DOCKER_REPOSITORY' --buildArgs $DOCKER_PROJECT_ARGS --dockerTags '$TAG_VERSION,$TRAVIS_BRANCH' " npx @lfresco/adf-cli docker-publish --loginCheck --loginUsername "$DOCKER_REPOSITORY_USER" --loginPassword "$DOCKER_REPOSITORY_PASSWORD" --loginRepo "$DOCKER_REPOSITORY_DOMAIN" --dockerRepo "$DOCKER_REPOSITORY" --buildArgs "$DOCKER_PROJECT_ARGS" --dockerTags "$TAG_VERSION,$TRAVIS_BRANCH" --pathProject "$(pwd)"