Skip to content

Commit

Permalink
Restore Temurin 11 [VS-570] (#7972)
Browse files Browse the repository at this point in the history
  • Loading branch information
mcovarr authored Aug 3, 2022
1 parent 0f7e2fd commit 3e62331
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .dockstore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ workflows:
branches:
- master
- ah_var_store
- mc_debug_temurin_issues
- mc_restore_temurin
- name: GvsIngestTieout
subclass: WDL
primaryDescriptorPath: /scripts/variantstore/wdl/GvsIngestTieout.wdl
Expand Down
25 changes: 14 additions & 11 deletions scripts/variantstore/wdl/GvsUtils.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -260,19 +260,22 @@ task BuildGATKJarAndCreateDataset {
apt-get -qq update
apt-get -qq install git git-lfs

# Temurin Java 11
# apt-get -qq install wget apt-transport-https gnupg
# wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
# echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
# apt-get -qq --fix-missing update
# apt -qq install -y temurin-11-jdk

# The Terra microservices are currently aligned on Temurin as their JDK distribution which is why we use it here.
# However at least once Temurin unexpectedly became unavailable for download for several hours which broke this
# task and its dependents. The following block switched the JDK distribution to Amazon Corretto 11 which appeared to
# work just fine for our purposes during Temurin's brief absence.
#
# Corretto Java 11
apt-get -qq install wget apt-transport-https gnupg software-properties-common
wget -O- https://apt.corretto.aws/corretto.key | apt-key add -
add-apt-repository 'deb https://apt.corretto.aws stable main'
# apt-get -qq install wget apt-transport-https gnupg software-properties-common
# wget -O- https://apt.corretto.aws/corretto.key | apt-key add -
# add-apt-repository 'deb https://apt.corretto.aws stable main'

# Temurin Java 11
apt-get -qq install wget apt-transport-https gnupg
wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
apt-get -qq update
apt-get install -y java-11-amazon-corretto-jdk
apt -qq install -y temurin-11-jdk

# GATK
git clone https://github.com/broadinstitute/gatk.git --depth 1 --branch ~{branch_name} --single-branch
Expand Down

0 comments on commit 3e62331

Please sign in to comment.