academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update travis build stages to remove duplicate build and label (#263)

Browse Source 
* update travis build stages to remove duplicate build and label

* update copyright to 2019
This commit is contained in:
Rob Parker
2019-01-10 10:21:20 +00:00
committed by Arthur Barr
parent b1daacf377
commit 3e07814bf6
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
.travis.yml
View File

@@ -1,4 +1,4 @@
# © Copyright IBM Corporation 2018 # © Copyright IBM Corporation 2018, 2019
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -27,22 +27,26 @@ cache:
directories: directories:
- downloads - downloads
env:
- BASE_IMAGE=ubuntu:16.04
- BASE_IMAGE=centos:latest
jobs: jobs:
include: include:
- if: type IN (pull_request) - stage: build and test
env: DOCKER_DOWNGRADE="docker save -o images.tar mqadvanced-server-dev mq-dev-jms-test && env:
sudo apt-get autoremove -y docker-ce && - BASE_IMAGE=ubuntu:16.04
curl -fsSL \"https://apt.dockerproject.org/gpg\" | sudo apt-key add - && - DOCKER_DOWNGRADE="echo nothing to be done"
sudo apt-add-repository \"deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main\" && - env:
sudo apt-get update && - BASE_IMAGE=centos:latest
sudo apt-get install docker-engine=1.12.6-0~ubuntu-$(lsb_release -cs) && - DOCKER_DOWNGRADE="echo nothing to be done"
docker load -q -i images.tar && - if: type IN (pull_request) OR tag IS present
export DOCKER_API_VERSION=\"1.24\"" env:
- env: DOCKER_DOWNGRADE="echo nothing to be done" - BASE_IMAGE=ubuntu:16.04
- DOCKER_DOWNGRADE="docker save -o images.tar mqadvanced-server-dev mq-dev-jms-test &&
sudo apt-get autoremove -y docker-ce &&
curl -fsSL \"https://apt.dockerproject.org/gpg\" | sudo apt-key add - &&
sudo apt-add-repository \"deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main\" &&
sudo apt-get update &&
sudo apt-get install docker-engine=1.12.6-0~ubuntu-$(lsb_release -cs) &&
docker load -q -i images.tar &&
export DOCKER_API_VERSION=\"1.24\""
before_install: before_install:
- ./install-build-deps-ubuntu.sh - ./install-build-deps-ubuntu.sh