Skip to content

Commit b4bad3d

Browse files
committed
Restructure CI jobs - update host/boot JDK URLs
see ev3dev-lang-java/ev3dev-lang-java#674
1 parent 09d39ff commit b4bad3d

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

scripts/config.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -199,14 +199,14 @@ elif [ "$JDKVER" == "11" ]; then
199199
PATCHVER="jdk11"
200200
AUTOGEN_STYLE="v2"
201201
if [ "$BUILDER_TYPE" = "native" ]; then
202-
# stretch and buster have different versions
203202
HOSTJDK="$BUILDDIR/jdk-ev3"
204203
HOSTJDK_RENAME_FROM="$BUILDDIR/jdk"
205204
HOSTJDK_FILE="$BUILDDIR/jdk-ev3.tar.gz"
205+
# stretch and buster have different versions
206206
if [ "$BUILDER_DISTRO" = "stretch" ]; then
207-
HOSTJDK_URL="https://ci.adoptopenjdk.net/view/ev3dev/job/openjdk11_build_ev3_linux_native/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
207+
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/stretch-11/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
208208
else
209-
HOSTJDK_URL="https://ci.adoptopenjdk.net/view/ev3dev/job/openjdk11_build_ev3_linux_native_next/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
209+
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/buster-11/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
210210
fi
211211
else
212212
# same for both stretch & buster
@@ -227,14 +227,14 @@ elif [ "$JDKVER" == "12" ]; then
227227
PATCHVER="jdk12"
228228
AUTOGEN_STYLE="v2"
229229
if [ "$BUILDER_TYPE" = "native" ]; then
230-
# stretch and buster have different versions
231230
HOSTJDK="$BUILDDIR/jdk-ev3"
232231
HOSTJDK_RENAME_FROM="$BUILDDIR/jdk"
233232
HOSTJDK_FILE="$BUILDDIR/jdk-ev3.tar.gz"
233+
# stretch and buster have different versions
234234
if [ "$BUILDER_DISTRO" = "stretch" ]; then
235-
HOSTJDK_URL="https://ci.adoptopenjdk.net/view/ev3dev/job/openjdk11_build_ev3_linux_native/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
235+
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/stretch-11/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
236236
else
237-
HOSTJDK_URL="https://ci.adoptopenjdk.net/view/ev3dev/job/openjdk11_build_ev3_linux_native_next/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
237+
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/buster-11/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
238238
fi
239239
else
240240
# same for both stretch & buster
@@ -263,9 +263,9 @@ elif [ "$JDKVER" == "13" ]; then
263263
HOSTJDK_FILE="$BUILDDIR/jdk-ev3.tar.gz"
264264
# stretch and buster have different versions
265265
if [ "$BUILDER_DISTRO" = "stretch" ]; then
266-
HOSTJDK_URL="https://ci.adoptopenjdk.net/view/ev3dev/job/openjdk12_build_ev3_linux_native/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
266+
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/stretch-12/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
267267
else
268-
HOSTJDK_URL="https://ci.adoptopenjdk.net/view/ev3dev/job/openjdk12_build_ev3_linux_native_next/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
268+
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/buster-12/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
269269
fi
270270
else
271271
# same for both stretch & buster
@@ -289,14 +289,14 @@ elif [ "$JDKVER" == "tip" ]; then
289289
PATCHVER="jdk13"
290290
AUTOGEN_STYLE="v2"
291291
if [ "$BUILDER_TYPE" = "native" ]; then
292-
# stretch and buster have different versions
293292
HOSTJDK="$BUILDDIR/jdk-ev3"
294293
HOSTJDK_RENAME_FROM="$BUILDDIR/jdk"
295294
HOSTJDK_FILE="$BUILDDIR/jdk-ev3.tar.gz"
295+
# stretch and buster have different versions
296296
if [ "$BUILDER_DISTRO" = "stretch" ]; then
297-
HOSTJDK_URL="https://ci.adoptopenjdk.net/view/ev3dev/job/openjdk12_build_ev3_linux_native/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
297+
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/stretch-12/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
298298
else
299-
HOSTJDK_URL="https://ci.adoptopenjdk.net/view/ev3dev/job/openjdk12_build_ev3_linux_native_next/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
299+
HOSTJDK_URL="https://ci.adoptopenjdk.net/job/eljbuild/job/buster-12/lastSuccessfulBuild/artifact/build/jdk-ev3.tar.gz"
300300
fi
301301
else
302302
# same for both stretch & buster

0 commit comments

Comments
 (0)