Skip to content

Commit 28336a7

Browse files
authored
Merge pull request #200 from DataDog/tyler/temp-remove-java-7
Remove Java 7 CI build until flakiness is resolved.
2 parents c056a91 + be49819 commit 28336a7

1 file changed

Lines changed: 34 additions & 34 deletions

File tree

.circleci/config.yml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -61,36 +61,36 @@ jobs:
6161
root: .
6262
paths: .
6363

64-
test_7:
65-
<<: *defaults
66-
docker:
67-
- image: openjdk:7-jdk
68-
69-
steps:
70-
- attach_workspace:
71-
at: .
72-
73-
- run:
74-
name: Fix EC parameters error # (ref https://github.com/travis-ci/travis-ci/issues/8503)
75-
command: |
76-
wget "https://downloads.bouncycastle.org/java/bcprov-ext-jdk15on-158.jar" -O "${JAVA_HOME}"/jre/lib/ext/bcprov-ext-jdk15on-158.jar && \
77-
perl -pi.bak -e 's/^(security\.provider\.)([0-9]+)/$1.($2+1)/ge' /etc/java-7-openjdk/security/java.security && \
78-
echo "security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider" | tee -a /etc/java-7-openjdk/security/java.security
79-
80-
- run:
81-
name: Run Tests
82-
command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx2G -Xms512M" ./gradlew -g=gradle-home test --parallel --stacktrace --no-daemon --max-workers=3
83-
84-
- run:
85-
name: Save Artifacts to (project-root)/build
86-
when: always
87-
command: .circleci/save_artifacts.sh
88-
89-
- store_test_results:
90-
path: build/test-results
91-
92-
- store_artifacts:
93-
path: build
64+
# test_7:
65+
# <<: *defaults
66+
# docker:
67+
# - image: openjdk:7-jdk
68+
#
69+
# steps:
70+
# - attach_workspace:
71+
# at: .
72+
#
73+
# - run:
74+
# name: Fix EC parameters error # (ref https://github.com/travis-ci/travis-ci/issues/8503)
75+
# command: |
76+
# wget "https://downloads.bouncycastle.org/java/bcprov-ext-jdk15on-158.jar" -O "${JAVA_HOME}"/jre/lib/ext/bcprov-ext-jdk15on-158.jar && \
77+
# perl -pi.bak -e 's/^(security\.provider\.)([0-9]+)/$1.($2+1)/ge' /etc/java-7-openjdk/security/java.security && \
78+
# echo "security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider" | tee -a /etc/java-7-openjdk/security/java.security
79+
#
80+
# - run:
81+
# name: Run Tests
82+
# command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx2G -Xms512M" ./gradlew -g=gradle-home test --parallel --stacktrace --no-daemon --max-workers=3
83+
#
84+
# - run:
85+
# name: Save Artifacts to (project-root)/build
86+
# when: always
87+
# command: .circleci/save_artifacts.sh
88+
#
89+
# - store_test_results:
90+
# path: build/test-results
91+
#
92+
# - store_artifacts:
93+
# path: build
9494

9595
test_8:
9696
<<: *defaults
@@ -158,9 +158,9 @@ workflows:
158158
jobs:
159159
- build
160160

161-
- test_7:
162-
requires:
163-
- build
161+
# - test_7:
162+
# requires:
163+
# - build
164164
- test_8:
165165
requires:
166166
- build
@@ -171,7 +171,7 @@ workflows:
171171
- scan_and_save:
172172
requires:
173173
- build
174-
- test_7
174+
# - test_7
175175
- test_8
176176
# - test_9
177177

0 commit comments

Comments
 (0)