Merge pull request #200 from DataDog/tyler/temp-remove-java-7
Remove Java 7 CI build until flakiness is resolved.
This commit is contained in:
commit
28336a7b4e
|
@ -61,36 +61,36 @@ jobs:
|
||||||
root: .
|
root: .
|
||||||
paths: .
|
paths: .
|
||||||
|
|
||||||
test_7:
|
# test_7:
|
||||||
<<: *defaults
|
# <<: *defaults
|
||||||
docker:
|
# docker:
|
||||||
- image: openjdk:7-jdk
|
# - image: openjdk:7-jdk
|
||||||
|
#
|
||||||
steps:
|
# steps:
|
||||||
- attach_workspace:
|
# - attach_workspace:
|
||||||
at: .
|
# at: .
|
||||||
|
#
|
||||||
- run:
|
# - run:
|
||||||
name: Fix EC parameters error # (ref https://github.com/travis-ci/travis-ci/issues/8503)
|
# name: Fix EC parameters error # (ref https://github.com/travis-ci/travis-ci/issues/8503)
|
||||||
command: |
|
# command: |
|
||||||
wget "https://downloads.bouncycastle.org/java/bcprov-ext-jdk15on-158.jar" -O "${JAVA_HOME}"/jre/lib/ext/bcprov-ext-jdk15on-158.jar && \
|
# wget "https://downloads.bouncycastle.org/java/bcprov-ext-jdk15on-158.jar" -O "${JAVA_HOME}"/jre/lib/ext/bcprov-ext-jdk15on-158.jar && \
|
||||||
perl -pi.bak -e 's/^(security\.provider\.)([0-9]+)/$1.($2+1)/ge' /etc/java-7-openjdk/security/java.security && \
|
# perl -pi.bak -e 's/^(security\.provider\.)([0-9]+)/$1.($2+1)/ge' /etc/java-7-openjdk/security/java.security && \
|
||||||
echo "security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider" | tee -a /etc/java-7-openjdk/security/java.security
|
# echo "security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider" | tee -a /etc/java-7-openjdk/security/java.security
|
||||||
|
#
|
||||||
- run:
|
# - run:
|
||||||
name: Run Tests
|
# name: Run Tests
|
||||||
command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx2G -Xms512M" ./gradlew -g=gradle-home test --parallel --stacktrace --no-daemon --max-workers=3
|
# command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx2G -Xms512M" ./gradlew -g=gradle-home test --parallel --stacktrace --no-daemon --max-workers=3
|
||||||
|
#
|
||||||
- run:
|
# - run:
|
||||||
name: Save Artifacts to (project-root)/build
|
# name: Save Artifacts to (project-root)/build
|
||||||
when: always
|
# when: always
|
||||||
command: .circleci/save_artifacts.sh
|
# command: .circleci/save_artifacts.sh
|
||||||
|
#
|
||||||
- store_test_results:
|
# - store_test_results:
|
||||||
path: build/test-results
|
# path: build/test-results
|
||||||
|
#
|
||||||
- store_artifacts:
|
# - store_artifacts:
|
||||||
path: build
|
# path: build
|
||||||
|
|
||||||
test_8:
|
test_8:
|
||||||
<<: *defaults
|
<<: *defaults
|
||||||
|
@ -158,9 +158,9 @@ workflows:
|
||||||
jobs:
|
jobs:
|
||||||
- build
|
- build
|
||||||
|
|
||||||
- test_7:
|
# - test_7:
|
||||||
requires:
|
# requires:
|
||||||
- build
|
# - build
|
||||||
- test_8:
|
- test_8:
|
||||||
requires:
|
requires:
|
||||||
- build
|
- build
|
||||||
|
@ -171,7 +171,7 @@ workflows:
|
||||||
- scan_and_save:
|
- scan_and_save:
|
||||||
requires:
|
requires:
|
||||||
- build
|
- build
|
||||||
- test_7
|
# - test_7
|
||||||
- test_8
|
- test_8
|
||||||
# - test_9
|
# - test_9
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue