Run default release pipeline last

This commit is contained in:
Dave Chevell 2019-08-03 21:19:19 +10:00
parent 565930db97
commit fdcd9fce7a

View File

@ -3,19 +3,6 @@ image: atlassian/docker-release-maker:latest
pipelines: pipelines:
custom: custom:
new-releases: new-releases:
- step:
name: Confluence Ubuntu
services:
- docker
script:
- export BASE_VERSION='6'
- export DEFAULT_RELEASE='true'
- export DOCKER_REPO='atlassian/confluence-server'
- export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
- export MAC_PRODUCT_KEY='confluence'
- export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- python /usr/src/app/run.py --create
- step: - step:
name: Confluence Alpine name: Confluence Alpine
services: services:
@ -30,6 +17,19 @@ pipelines:
- export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8' - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- python /usr/src/app/run.py --create - python /usr/src/app/run.py --create
- step:
name: Confluence Ubuntu
services:
- docker
script:
- export BASE_VERSION='6'
- export DEFAULT_RELEASE='true'
- export DOCKER_REPO='atlassian/confluence-server'
- export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
- export MAC_PRODUCT_KEY='confluence'
- export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- python /usr/src/app/run.py --create
ubuntu-custom-release: ubuntu-custom-release:
- variables: - variables:
- name: CONFLUENCE_VERSION - name: CONFLUENCE_VERSION
@ -59,19 +59,6 @@ pipelines:
- docker push atlassian/confluence-server:${DOCKER_TAG} - docker push atlassian/confluence-server:${DOCKER_TAG}
branches: branches:
master: master:
- step:
name: Confluence Ubuntu
services:
- docker
script:
- export BASE_VERSION='6'
- export DEFAULT_RELEASE='true'
- export DOCKER_REPO='atlassian/confluence-server'
- export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
- export MAC_PRODUCT_KEY='confluence'
- export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- python /usr/src/app/run.py --update
- step: - step:
name: Confluence Alpine name: Confluence Alpine
services: services:
@ -86,6 +73,19 @@ pipelines:
- export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8' - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- python /usr/src/app/run.py --update - python /usr/src/app/run.py --update
- step:
name: Confluence Ubuntu
services:
- docker
script:
- export BASE_VERSION='6'
- export DEFAULT_RELEASE='true'
- export DOCKER_REPO='atlassian/confluence-server'
- export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
- export MAC_PRODUCT_KEY='confluence'
- export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- python /usr/src/app/run.py --update
pull-requests: pull-requests:
'**': '**':
- step: - step: