Merge pull request #526 from DataDog/mar-kolya/use-custom-container

Use custom container to perform builds
This commit is contained in:
Nikolay Martynov 2018-10-03 16:30:12 -04:00 committed by GitHub
commit 49f72efb85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 23 deletions

View File

@ -4,7 +4,7 @@ defaults: &defaults
working_directory: ~/dd-trace-java
resource_class: xlarge
docker:
- image: &default_container circleci/openjdk:8
- image: &default_container datadog/dd-trace-java-docker-build:latest
cache_keys: &cache_keys
# Reset the cache approx every release
@ -56,20 +56,6 @@ jobs:
steps:
- checkout
- run:
name: Install Additional JVM
command: |
if [ "${INSTALL_ZULU}" != "" ]; then
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9
echo 'deb http://repos.azulsystems.com/debian stable main' | sudo tee -a /etc/apt/sources.list.d/zulu.list
sudo apt-get update
sudo apt-get install $INSTALL_ZULU
fi
if [ "${INSTALL_OPENJDK}" != "" ]; then
wget -O ~/openjdk.tar.gz $INSTALL_OPENJDK
sudo tar xvf ~/openjdk.tar.gz -C /usr/lib/jvm/
fi
- attach_workspace:
at: .
@ -99,9 +85,7 @@ jobs:
test_7:
<<: *default_test_job
environment:
- JAVA_7_HOME: /usr/lib/jvm/zulu-7-amd64
- TEST_TASK: testJava7
- INSTALL_ZULU: zulu-7
test_8:
<<: *default_test_job
@ -112,23 +96,17 @@ jobs:
test_9:
<<: *default_test_job
environment:
- JAVA_9_HOME: /usr/lib/jvm/zulu-9-amd64
- TEST_TASK: testJava9
- INSTALL_ZULU: zulu-9
test_10:
<<: *default_test_job
environment:
- JAVA_10_HOME: /usr/lib/jvm/zulu-10-amd64
- TEST_TASK: testJava10
- INSTALL_ZULU: zulu-10
test_11:
<<: *default_test_job
environment:
- JAVA_11_HOME: /usr/lib/jvm/jdk-11
- TEST_TASK: testJava11
- INSTALL_OPENJDK: https://download.java.net/java/ga/jdk11/openjdk-11_linux-x64_bin.tar.gz
agent_integration_tests:
<<: *defaults