WX-1179 DRS image build updates, remove self-hosted runners (#7179)

broadinstitute · Jul 20, 2023 · d1ef074 · d1ef074
1 parent 4ca252c
commit d1ef074
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/chart_update_on_merge.yml b/.github/workflows/chart_update_on_merge.yml
@@ -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

diff --git a/.github/workflows/docker_build_test.yml b/.github/workflows/docker_build_test.yml
@@ -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

diff --git a/.github/workflows/make_publish_prs.yml b/.github/workflows/make_publish_prs.yml
@@ -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
@@ -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')
             });
-
diff --git a/centaur/src/main/resources/standardTestCases/drs_tests/drs_usa_jdr.wdl b/centaur/src/main/resources/standardTestCases/drs_tests/drs_usa_jdr.wdl
@@ -61,7 +61,7 @@ task localize_jdr_drs_with_usa {
     }
 
     runtime {
-        docker: "ubuntu"
+        docker: "ubuntu:latest"
         backend: "papi-v2-usa"
     }
 }
@@ -88,7 +88,7 @@ task skip_localize_jdr_drs_with_usa {
     }
 
     runtime {
-        docker: "ubuntu"
+        docker: "ubuntu:latest"
         backend: "papi-v2-usa"
     }
 }
@@ -109,7 +109,7 @@ task read_drs_with_usa {
     }
 
     runtime {
-        docker: "ubuntu"
+        docker: "ubuntu:latest"
         backend: "papi-v2-usa"
     }
 }
diff --git a/project/Settings.scala b/project/Settings.scala
@@ -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"),
+      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),