Skip to content

Commit

Permalink
Temporarily swap in Corretto for Temurin as we can't download Temurin. (
Browse files Browse the repository at this point in the history
  • Loading branch information
mcovarr authored Aug 1, 2022
1 parent 8dd4541 commit fc2b7a8
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
3 changes: 1 addition & 2 deletions .dockstore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,7 @@ workflows:
branches:
- master
- ah_var_store
- rsa_metadata_from_python
- gg_VS-492_BetaUserJarRelease
- mc_debug_temurin_issues
- name: GvsIngestTieout
subclass: WDL
primaryDescriptorPath: /scripts/variantstore/wdl/GvsIngestTieout.wdl
Expand Down
19 changes: 13 additions & 6 deletions scripts/variantstore/wdl/GvsUtils.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -254,18 +254,25 @@ task BuildGATKJarAndCreateDataset {

command <<<
# Much of this could/should be put into a Docker image.
set -o errexit -o nounset -o pipefail
set -o errexit -o nounset -o pipefail -o xtrace

# git and git-lfs
apt-get -qq update
apt-get -qq install git git-lfs

# Java
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
# 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

# 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 update
apt -qq install -y temurin-11-jdk
apt-get install -y java-11-amazon-corretto-jdk

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

0 comments on commit fc2b7a8

Please sign in to comment.