WX-1351 Another round of CI cleanup

src/ci/bin/testCentaurHoricromtalPapiV2beta.sh

@@ -26,6 +26,8 @@ cromwell::build::run_centaur \
     -e standard_output_paths_colliding_prevented \
     -e papi_v2alpha1_gcsa \
     -e restart \
+    -e lots_of_inputs \
+    # `lots_of_inputs` is redundant to, and a less rigorous version of, `lots_of_inputs_papiv2`
 
 cromwell::build::generate_code_coverage
 

src/ci/bin/testCentaurPapiV2beta.sh

@@ -24,6 +24,8 @@ cromwell::build::run_centaur \
     -e standard_output_paths_colliding_prevented \
     -e papi_v2alpha1_gcsa \
     -e restart \
+    -e lots_of_inputs \
+    # `lots_of_inputs` is redundant to, and a less rigorous version of, `lots_of_inputs_papiv2`
 
 cromwell::build::generate_code_coverage
 

src/ci/bin/test_gcpbatch.inc.sh

@@ -29,10 +29,6 @@ cromwell::private::batch::setup_batch_gcloud() {
     export CROMWELL_BUILD_BATCH_GCR_IMAGES
     export CROMWELL_BUILD_BATCH_PROJECT_ID
 
-    if [[ "${CROMWELL_BUILD_PROVIDER}" == "${CROMWELL_BUILD_PROVIDER_TRAVIS}" ]]; then
-        cromwell::private::batch::install_gcloud
-    fi
-
     # All `gcloud` commands should use this configuration directory.
     # https://stackoverflow.com/questions/34883810/how-to-authenticate-google-apis-with-different-service-account-credentials
     # https://github.com/googleapis/google-auth-library-java/issues/58
@@ -106,9 +102,5 @@ cromwell::private::batch::setup_batch_service_account() {
 
 cromwell::build::batch::setup_batch_centaur_environment() {
     cromwell::private::batch::setup_batch_gcloud
-    if [[ "${CROMWELL_BUILD_PROVIDER}" != "${CROMWELL_BUILD_PROVIDER_JENKINS}" ]]
-    then
-        cromwell::private::batch::setup_batch_gcr
-    fi
     cromwell::private::batch::setup_batch_service_account
 }

src/ci/bin/test_papi.inc.sh

@@ -29,10 +29,6 @@ cromwell::private::papi::setup_papi_gcloud() {
     export CROMWELL_BUILD_PAPI_GCR_IMAGES
     export CROMWELL_BUILD_PAPI_PROJECT_ID
 
-    if [[ "${CROMWELL_BUILD_PROVIDER}" == "${CROMWELL_BUILD_PROVIDER_TRAVIS}" ]]; then
-        cromwell::private::papi::install_gcloud
-    fi
-
     # All `gcloud` commands should use this configuration directory.
     # https://stackoverflow.com/questions/34883810/how-to-authenticate-google-apis-with-different-service-account-credentials
     # https://github.com/googleapis/google-auth-library-java/issues/58
@@ -115,10 +111,7 @@ cromwell::private::papi::setup_papi_endpoint_url() {
 
 cromwell::build::papi::setup_papi_centaur_environment() {
     cromwell::private::papi::setup_papi_gcloud
-    if [[ "${CROMWELL_BUILD_PROVIDER}" != "${CROMWELL_BUILD_PROVIDER_JENKINS}" ]]
-    then
-        cromwell::private::papi::setup_papi_gcr
-    fi
+    cromwell::private::papi::setup_papi_gcr
     cromwell::private::papi::setup_papi_service_account
     cromwell::private::papi::setup_papi_endpoint_url
 }

src/ci/bin/test_unit.inc.sh

@@ -18,12 +18,6 @@ source "${BASH_SOURCE%/*}/test.inc.sh" || source test.inc.sh
 
 cromwell::build::unit::setup_scale_factor() {
     case "${CROMWELL_BUILD_PROVIDER}" in
-        "${CROMWELL_BUILD_PROVIDER_TRAVIS}")
-            CROMWELL_BUILD_UNIT_SPAN_SCALE_FACTOR=2
-            ;;
-        "${CROMWELL_BUILD_PROVIDER_JENKINS}")
-            CROMWELL_BUILD_UNIT_SPAN_SCALE_FACTOR=10
-            ;;
         *)
             CROMWELL_BUILD_UNIT_SPAN_SCALE_FACTOR=1
             ;;
@@ -33,12 +27,6 @@ cromwell::build::unit::setup_scale_factor() {
 
 cromwell::build::unit::setup_exclude_tags() {
     case "${CROMWELL_BUILD_PROVIDER}" in
-        "${CROMWELL_BUILD_PROVIDER_TRAVIS}")
-            CROMWELL_BUILD_UNIT_EXCLUDE_TAGS="AwsTest,CromwellIntegrationTest,DbmsTest,GcsIntegrationTest"
-            ;;
-        "${CROMWELL_BUILD_PROVIDER_JENKINS}")
-            CROMWELL_BUILD_UNIT_EXCLUDE_TAGS="AwsTest,CromwellIntegrationTest,DockerTest,DbmsTest,GcsIntegrationTest"
-            ;;
         *)
             # Use the full list of excludes listed in Testing.scala
             CROMWELL_BUILD_UNIT_EXCLUDE_TAGS=""