Merge branch 'develop' into jgd_WX-1105_blobread

broadinstitute · May 16, 2023 · d1a4fe4 · d1a4fe4
2 parents 0d60d57 + 3db13d4
commit d1a4fe4
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/.github/workflows/validate_pr_name.yml b/.github/workflows/validate_pr_name.yml
@@ -0,0 +1,23 @@
+# A github action to validate the name of a pull request contains a Jira tag:
+
+name: Validate PR name
+
+on:
+  pull_request:
+    types: [opened, edited, synchronize]
+
+jobs:
+  validate_pr_name:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate PR title
+        id: validate
+        uses: actions/github-script@v3
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const title = context.payload.pull_request.title;
+            const regex = /[A-Z][A-Z]+-\d+/;
+            if (!regex.test(title)) {
+              core.setFailed("PR title must contain a Jira tag");
+            }
diff --git a/centaur/test_cromwell.sh b/centaur/test_cromwell.sh
@@ -37,7 +37,7 @@ Arguments:
 INITIAL_DIR=$(pwd)
 RUN_DIR=$(pwd)
 LOG_DIR="${RUN_DIR}"/logs
-TEST_THREAD_COUNT=16
+TEST_THREAD_COUNT=16  # Note that most users of this script override this value
 CENTAUR_SBT_COVERAGE=false
 CROMWELL_TIMEOUT=10s
 SUITE=""

diff --git a/src/ci/bin/get_cromwell_hosts.py b/src/ci/bin/get_cromwell_hosts.py
@@ -1,9 +1,9 @@
 # Based on https://stackoverflow.com/a/39895650
 from __future__ import print_function
-from docker import Client
+from docker import APIClient
 import os
 
-cli = Client(base_url='unix://var/run/docker.sock')
+cli = APIClient(base_url='unix://var/run/docker.sock')
 
 our_hostname = os.environ.get("HOSTNAME")
 

diff --git a/src/ci/bin/test-deadlock.sh b/src/ci/bin/test-deadlock.sh
@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-pip3 install docker-py
+pip3 install docker
 
 cromwell_hosts_file="${CROMWELL_BUILD_RESOURCES_DIRECTORY}/cromwell_hosts.txt"
 

diff --git a/src/ci/bin/testCentaurTes.sh b/src/ci/bin/testCentaurTes.sh
@@ -58,9 +58,10 @@ startup_funnel
 # read_file_limits:          Fail only in Travis for unknown reason (Note that the draft 3 version does not fail)
 # docker_hash_dockerhub:     Prone to request rate limiting by Dockerhub
 
-# Limiting Centaur to 4 threads here in order to try to prevent exceeding the OS's max open files limit: BA-6153
+# Setting threads to 8 upon moving from Travis to Github Actions. If we run into problems with
+# exceeding the OS's max open files limit, reduce. See BA-6153.
 cromwell::build::run_centaur \
-    -p 2 \
+    -p 8 \
     -e docker_hash_dockerhub \
     -e call_cache_capoeira_local \
     -e draft3_call_cache_capoeira_local \