Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WX-1179 DRS image build updates #7179

Merged
merged 5 commits into from
Jul 20, 2023
Merged

WX-1179 DRS image build updates #7179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ecc853d
DRS image build updates
aednichols Jul 18, 2023
344e3a4
Specific image for failing test
aednichols Jul 19, 2023
ebe7c13
Remove GitHub Actions `self-hosted`
aednichols Jul 19, 2023
1437fe9
`wget` seems more stable in terms of not getting SSL errors
aednichols Jul 19, 2023
046b7d5
Merge branch 'develop' into aen_wx_1179_fix_drs
aednichols Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/chart_update_on_merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
chart-update:
name: Cromwhelm Chart Auto Updater
if: github.event.pull_request.merged == true
runs-on: self-hosted # Faster machines; see https://github.com/broadinstitute/cromwell/settings/actions/runners
runs-on: ubuntu-latest
steps:
- name: Fetch Jira ID from the commit message
id: fetch-jira-id
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_build_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ permissions:
jobs:
sbt-build:
name: sbt docker build
runs-on: self-hosted
runs-on: ubuntu-latest
steps:
- name: Clone Cromwell
uses: actions/checkout@v2
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/make_publish_prs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
jobs:
make-firecloud-develop-pr:
name: Create firecloud-develop PR
runs-on: self-hosted # Faster machines; see https://github.com/broadinstitute/cromwell/settings/actions/runners
runs-on: ubuntu-latest
steps:
- name: Clone firecloud-develop
uses: actions/checkout@v2
Expand Down Expand Up @@ -70,4 +70,3 @@ jobs:
'It updates cromwell from version ${{ github.event.inputs.old_cromwell_version }} to ${{ github.event.inputs.new_cromwell_version }}.'
].join('\n')
});

6 changes: 3 additions & 3 deletions centaur/src/main/resources/standardTestCases/drs_tests/drs_usa_jdr.wdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ task localize_jdr_drs_with_usa {
}

runtime {
docker: "ubuntu"
docker: "ubuntu:latest"
backend: "papi-v2-usa"
}
}
Expand All @@ -88,7 +88,7 @@ task skip_localize_jdr_drs_with_usa {
}

runtime {
docker: "ubuntu"
docker: "ubuntu:latest"
backend: "papi-v2-usa"
}
}
Expand All @@ -109,7 +109,7 @@ task read_drs_with_usa {
}

runtime {
docker: "ubuntu"
docker: "ubuntu:latest"
backend: "papi-v2-usa"
}
}
6 changes: 3 additions & 3 deletions project/Settings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,14 @@ object Settings {
// instructions to install `crcmod`
Instructions.Run("apt-get -y update"),
Instructions.Run("apt-get -y install python3.11"),
Instructions.Run("apt -y install python3-pip"),
Instructions.Run("apt-get -y install gcc python3-dev python3-setuptools"),
Instructions.Run("apt-get -y install python3-pip"),
Copy link
Collaborator Author

@aednichols aednichols Jul 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a stowaway change due to apt warning against use in scripts (unstable interface)

Instructions.Run("apt-get -y install wget gcc python3-dev python3-setuptools"),
Instructions.Run("pip3 uninstall crcmod"),
Instructions.Run("pip3 install --no-cache-dir -U crcmod"),
Instructions.Run("update-alternatives --install /usr/bin/python python /usr/bin/python3 1"),
Instructions.Env("CLOUDSDK_PYTHON", "python3"),
// instructions to install Google Cloud SDK
Instructions.Run("curl https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz > /tmp/google-cloud-sdk.tar.gz"),
Instructions.Run("wget https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz -O /tmp/google-cloud-sdk.tar.gz"),
Instructions.Run("""mkdir -p /usr/local/gcloud \
| && tar -C /usr/local/gcloud -xvf /tmp/google-cloud-sdk.tar.gz \
| && /usr/local/gcloud/google-cloud-sdk/install.sh""".stripMargin),
Expand Down
Loading