Skip to content

10.3 docker #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Oct 25, 2018
Merged

10.3 docker #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7f070f3
Testing Docker init with volumes
Oct 25, 2018
425e53c
Redirecting build.dir to /tmp
Oct 25, 2018
a26acab
Redirecting antcc build to ~/antcc/build
Oct 25, 2018
738212d
User shell var instead
Oct 25, 2018
a34a479
Use $HOME/.sag/build
Oct 25, 2018
0494e43
Using /tmp
Oct 25, 2018
6973b39
Fixes for build.dir
Oct 25, 2018
2699a70
Wait for CC before test
Oct 25, 2018
8a816b8
fixed build.dir resolution
Oct 25, 2018
1be29a1
Use ${build.dir}
Oct 25, 2018
10aa02c
Docker and non-docker tests
Oct 25, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,31 @@ matrix:
include:
- os: linux
dist: trusty
- os: osx
fast_finish: true

env:
global:
- CC_ENV=travis-ci
- CC_PASSWORD=manage123

# matrix:
# - CC_BOOT=default
services:
- docker

before_install:
- antcc/bootstrap/install.sh
- . $HOME/.bash_profile
- docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"

script:
- docker-compose run --rm init
- docker-compose down
- docker-compose up -d cc
- docker-compose run --rm init ant waitcc test -Dbuild.dir=/tmp/build
- docker-compose down

- antcc/bootstrap/install.sh
- . $HOME/.bash_profile
- antcc boot -Daccept.license=true
- antcc up test
- antcc up test stopcc

cache:
directories:
directories:
- $HOME/Downloads
2 changes: 1 addition & 1 deletion antcc
Open in desktop
Submodule antcc updated from 83e7a6 to af7e06
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ services:
- EMPOWER_USR
- EMPOWER_PSW
- CC_PASSWORD
command: ant up test clean
command: ant up test clean -Dbuild.dir=/tmp/build
depends_on:
- cc
8 changes: 4 additions & 4 deletions tests/test-masters.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@

<target name="test-repos-master-prods" depends="sagenvInit" description="Verify SAG product repositories">
<property file="${env.properties}"/>
<cc command="list repository products" expectedvalues="${release}" format="csv" output="build/logs/product-repos.csv" wait="5" />
<cc command="list repository products" expectedvalues="${release}" format="csv" output="${build.dir}/logs/product-repos.csv" wait="5" />
</target>

<!-- <target name="test-repos-master-prods-listing" depends="sagenvInit" description="Verify SAG product repository listing">
<property file="${env.properties}"/>
<cc command="list repository products content webMethods-${release}" expectedvalues="SPM" format="csv" output="build/logs/products.csv" wait="240" />
<cc command="list repository products content webMethods-${release}" expectedvalues="SPM" format="csv" output="${build.dir}/logs/products.csv" wait="240" />
</target> -->

<target name="test-repos-master-fixes" depends="sagenvInit" description="Verify SAG fix repositories">
<cc command="list repository fixes" expectedvalues="Empower" format="csv" output="build/logs/fix-repos.csv" wait="5" />
<cc command="list repository fixes" expectedvalues="Empower" format="csv" output="${build.dir}/logs/fix-repos.csv" wait="5" />
</target>

<target name="test-repos-master-fixes-listing" depends="sagenvInit" description="Verify SAG fix repository listing">
<cc command="list repository fixes content Empower" expectedvalues="SPM" format="csv" output="build/logs/fixes.csv" />
<cc command="list repository fixes content Empower" expectedvalues="SPM" format="csv" output="${build.dir}/logs/fixes.csv" />
</target>

</project>