Remove get_source_dragonwell.sh, Dragonwell8 is monorepo (adoptium#2912)

zdtsw · May 13, 2022 · 0363f37 · 0363f37
1 parent 2e4de67
commit 0363f37
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,6 +43,10 @@ jobs:
             version: jdk11u
             vm: dragonwell
             image: adoptopenjdk/centos7_build_image
+          - os: linux
+            version: jdk8u
+            vm: dragonwell
+            image: adoptopenjdk/centos7_build_image
           - os: linux
             version: jdk11u
             vm: fast_startup

diff --git a/build-farm/platform-specific-configurations/linux.sh b/build-farm/platform-specific-configurations/linux.sh
@@ -120,7 +120,7 @@ if [ "${VARIANT}" == "${BUILD_VARIANT_DRAGONWELL}" ] && [ "$JAVA_FEATURE_VERSION
     echo Dragonwell 8 requires a Dragonwell boot JDK - downloading one ...
     mkdir -p "$PWD/jdk-8"
     if [ "$(uname -m)" = "x86_64" ]; then
-      curl -L "https://github.com/alibaba/dragonwell8/releases/download/v8.0.0-GA/Alibaba_Dragonwell_8.0.0-GA_Linux_x64.tar.gz" | tar xpzf - --strip-components=1 -C "$PWD/jdk-8"
+      curl -L "https://github.com/alibaba/dragonwell8/releases/download/dragonwell-8.11.12_jdk8u332-ga/Alibaba_Dragonwell_8.11.12_x64_linux.tar.gz" | tar xpzf - --strip-components=1 -C "$PWD/jdk-8"
     elif [ "$(uname -m)" = "aarch64" ]; then
       curl -L "https://github.com/alibaba/dragonwell8/releases/download/dragonwell-8.8.9_jdk8u302-ga/Alibaba_Dragonwell_8.8.9_aarch64_linux.tar.gz" | tar xpzf - --strip-components=1 -C "$PWD/jdk-8"
     else

diff --git a/sbin/prepareWorkspace.sh b/sbin/prepareWorkspace.sh
@@ -112,7 +112,6 @@ checkoutAndCloneOpenJDKGitRepo() {
   git clean -ffdx
 
   updateOpenj9Sources
-  updateDragonwellSources
 
   createSourceTagFile
 
@@ -269,26 +268,6 @@ updateOpenj9Sources() {
   fi
 }
 
-updateDragonwellSources() {
-  if [[ "${BUILD_CONFIG[BUILD_VARIANT]}" == "${BUILD_VARIANT_DRAGONWELL}" ]] && [[ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" == "${JDK8_CORE_VERSION}" ]]; then
-    cd "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/${BUILD_CONFIG[OPENJDK_SOURCE_DIR]}" || return
-    local target_scm
-    if [ -n "${BUILD_CONFIG[TAG]}" ]; then
-      target_scm="${BUILD_CONFIG[TAG]}"
-    else
-      target_scm="${BUILD_CONFIG[BRANCH]}"
-    fi
-    # Download directly from github and not the proxy for Adoptium machine performance
-    perl -p -i -e 's/github.com.cnpmjs.org/github.com/g' get_source_dragonwell.sh
-    if [ "${BUILD_CONFIG[RELEASE]}" == "false" ]; then
-      bash get_source_dragonwell.sh --site github --branch "${target_scm}"
-    else
-      bash get_source_dragonwell.sh --site github --branch "${target_scm}" -r
-    fi
-    cd "${BUILD_CONFIG[WORKSPACE_DIR]}"
-  fi
-}
-
 # Clone the git repo
 cloneOpenJDKGitRepo() {
   setGitCloneArguments