Unbreak the build, some image updates [BW-752]

.circleci/config.yml

@@ -5,8 +5,6 @@
 version: 2
 
 job_defaults: &job_defaults
-  machine:
-    image: circleci/classic:latest
   working_directory: ~/job-manager
 
 run_env_setup: &run_env_setup
@@ -28,6 +26,8 @@ run_secret_setup: &run_secret_setup
 jobs:
   ui:
     <<: *job_defaults
+    machine:
+      image: circleci/classic:latest
     steps:
       - checkout
       - <<: *run_env_setup
@@ -37,7 +37,7 @@ jobs:
       - run:
           name: nvm install node and UI dependencies
           command: |
-            /opt/circleci/.nvm/nvm.sh install 8.5.0
+            /opt/circleci/.nvm/nvm.sh install --lts
             cd ui
             npm install
             npm install -g @angular/[email protected]
@@ -52,13 +52,13 @@ jobs:
       - run:
           name: Lint angular code with ng lint
           command: |
-            /opt/circleci/.nvm/nvm.sh use 8.5.0
+            /opt/circleci/.nvm/nvm.sh install --lts
             cd ui
             ng lint --type-check
       - run:
           name: Run UI unit tests
           command: |
-            /opt/circleci/.nvm/nvm.sh use 8.5.0
+            /opt/circleci/.nvm/nvm.sh install --lts
             cd ui
             ng test --single-run -sm=false --browsers=ChromeHeadless
       - run:
@@ -67,21 +67,20 @@ jobs:
           # because we do not have a prod environment file.
           # https://github.com/angular/angular-cli/wiki/build#--dev-vs---prod-builds
           command: |
-            /opt/circleci/.nvm/nvm.sh use 8.5.0
+            /opt/circleci/.nvm/nvm.sh install --lts
             cd ui
             ng build --target=production --environment=dev
 
   backends:
     <<: *job_defaults
+    machine:
+      image: ubuntu-2004:202104-01
     environment:
-      - KEEP_TEST_DSUB_FILES: true
       - GOOGLE_APPLICATION_CREDENTIALS: /home/circleci/gcloud-service-key.json
     steps:
       - checkout
       - <<: *run_env_setup
       - <<: *run_secret_setup
-      - restore_cache:
-          key: node-modules-{{ .Branch }}--{{ checksum "servers/dsub/requirements.txt" }}
       - restore_cache:
           key: node-modules-{{ .Branch }}--{{ checksum "servers/cromwell/requirements.txt" }}
       - restore_cache:
@@ -90,6 +89,11 @@ jobs:
           name: Rebuild swagger
           command: |
             /bin/bash ./scripts/rebuild_swagger.sh
+      - run:
+          name: Check Python version
+          command: |
+            python --version
+            which python
       - run:
           name: Install tox and yapf
           # tox (and detox) fail with older versions of more-itertools: https://github.com/pytest-dev/pytest/issues/4770
@@ -100,18 +104,6 @@ jobs:
           name: Lint python code with yapf
           command: |
             sh ./scripts/yapf_lint.sh
-      - run:
-          name: Run dsub server tests
-          command: |
-            if [[ -z "$GCLOUD_SERVICE_KEY" || "${CIRCLE_BRANCH}" != "master" ]]; then
-              tox -p 8 -c ./servers/dsub -- \
-                --exclude-test=jobs.test.test_jobs_controller_google.TestJobsControllerGoogle \
-                --exclude-test=jobs.test.test_jobs_controller_google_v2.TestJobsControllerGoogleV2
-            else
-              echo $GCLOUD_SERVICE_KEY | base64 --decode --ignore-garbage > /home/circleci/gcloud-service-key.json
-              tox -p 8 -c ./servers/dsub
-              rm /home/circleci/gcloud-service-key.json
-            fi
       - run:
           name: Run cromwell server tests
           command: |
@@ -120,10 +112,6 @@ jobs:
           name: Run jm_utils server tests
           command: |
             tox -c ./servers/jm_utils
-      - save_cache:
-          key: node-modules-{{ .Branch }}--{{ checksum "servers/dsub/requirements.txt" }}
-          paths:
-            - "servers/dsub/.tox"
       - save_cache:
           key: node-modules-{{ .Branch }}--{{ checksum "servers/cromwell/requirements.txt" }}
           paths:
@@ -135,6 +123,8 @@ jobs:
 
   secrets:
     <<: *job_defaults
+    machine:
+      image: ubuntu-2004:202104-01
     steps:
       - checkout
       - <<: *run_env_setup

servers/cromwell/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk
+FROM us.gcr.io/broad-dsp-gcr-public/base/jre:11-debian
 
 WORKDIR /job-manager
 

ui/Dockerfile

@@ -1,12 +1,12 @@
-FROM openjdk
+FROM us.gcr.io/broad-dsp-gcr-public/base/jre:11-debian
 
 WORKDIR /job-manager
 
 ADD ./ /job-manager
 
 RUN /bin/bash -c scripts/rebuild_swagger.sh
 
-FROM node
+FROM node:lts
 
 WORKDIR /ui
 
@@ -21,7 +21,7 @@ RUN npm install
 
 RUN /ui/node_modules/.bin/ng build --prod
 
-FROM nginx:1.19.6
+FROM nginx:stable
 
 COPY --from=1 /ui/dist /ui/dist
 ADD ./ui/nginx.prod.conf /etc/nginx/nginx.conf