Merge pull request #220 from ustaxcourt/test

Release to production.
flexion · Jun 2, 2020 · 72a0584 · 72a0584
2 parents 5d28d3e + c5f58b6
commit 72a0584
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -503,23 +503,23 @@ jobs:
       - run:
           name: 'Deploy - Web API - Cognito Create Users'
           command: |
-            if [ "${CIRCLE_BRANCH}" != "migration" ] && [ "${CIRCLE_BRANCH}" != "master"]; then
+            if [ "${CIRCLE_BRANCH}" == "staging" ] || [ "${CIRCLE_BRANCH}" == "irs" ]; then
               docker run -e "AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}" -e "AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}" -e "USTC_ADMIN_PASS=${USTC_ADMIN_PASS}" --rm efcms /bin/sh -c "cd web-api && ./setup-cognito-users.sh ${ENV}"
             else
               echo "skipping…"
             fi
       - run:
           name: 'Deploy - Web API - Cognito Create Court Users'
           command:  |
-            if [ "${CIRCLE_BRANCH}" != "migration" ] && [ "${CIRCLE_BRANCH}" != "master"]; then
+            if [ "${CIRCLE_BRANCH}" == "staging" ] || [ "${CIRCLE_BRANCH}" == "test" ]; then
               docker run -e "AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}" -e "AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}" -e "USTC_ADMIN_PASS=${USTC_ADMIN_PASS}" --rm efcms /bin/sh -c "cd web-api && ./setup-court-users.sh ${ENV}"
             else
               echo "skipping…"
             fi
       - run:
           name: 'Deploy - Web API - Cognito Create IRS User'
           command:  |
-            if [ "${CIRCLE_BRANCH}" != "migration" ] && [ "${CIRCLE_BRANCH}" != "master"]; then
+            if [ "${CIRCLE_BRANCH}" == "irs" ]; then
               docker run -e "AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}" -e "AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}" -e "USTC_ADMIN_PASS=${USTC_ADMIN_PASS}" --rm efcms /bin/sh -c "cd web-api && ./setup-irs-user.sh ${ENV}"
             else
               echo "skipping…"
@@ -530,31 +530,31 @@ jobs:
       - run:
           name: 'Deploy - Web API - Smoke Tests - us-east-1'
           command: |
-            if [ "${CIRCLE_BRANCH}" != "migration" ] && [ "${CIRCLE_BRANCH}" != "master"]; then
+            if [ "${CIRCLE_BRANCH}" == "staging" ] || [ "${CIRCLE_BRANCH}" == "irs" ]; then
               docker run -e "AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}" -e "AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}" --rm efcms /bin/sh -c "cd web-api && node smoke-tests.js ${ENV} us-east-1"
             else
               echo "skipping…"
             fi
       - run:
           name: 'Deploy - Web API - Smoke Tests - us-west-1'
           command: |
-            if [ "${CIRCLE_BRANCH}" != "migration" ] && [ "${CIRCLE_BRANCH}" != "master"]; then
+            if [ "${CIRCLE_BRANCH}" == "staging" ] || [ "${CIRCLE_BRANCH}" == "irs" ]; then
               docker run -e "AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}" -e "AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}" --rm efcms /bin/sh -c "cd web-api && node smoke-tests.js ${ENV} us-west-1"
             else
               echo "skipping…"
             fi
       - run:
           name: 'Deploy - Cypress Smoke Tests'
           command: |
-            if [ "${CIRCLE_BRANCH}" != "migration" ] && [ "${CIRCLE_BRANCH}" != "master"]; then
+            if [ "${CIRCLE_BRANCH}" == "staging" ] || [ "${CIRCLE_BRANCH}" == "irs" ]; then
               docker run -e "AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}" -e "AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}" --rm efcms /bin/sh -c "CYPRESS_BASE_URL='https://ui-$ENV.$EFCMS_DOMAIN' ENV=${ENV} npm run cypress:smoketests"
             else
               echo "skipping…"
             fi
       - run:
           name: 'Deploy - Pa11y Smoke Tests'
           command: |
-            if [ "${CIRCLE_BRANCH}" != "migration" ] && [ "${CIRCLE_BRANCH}" != "master"]; then
+            if [ "${CIRCLE_BRANCH}" == "staging" ] || [ "${CIRCLE_BRANCH}" == "irs" ]; then
               docker run -e "AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}" -e "AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}" -e "EFCMS_DOMAIN=${EFCMS_DOMAIN}" --rm efcms /bin/sh -c "ENV=${ENV} npm run test:pa11y:smoketests"
             else
               echo "skipping…"

diff --git a/web-api/runtimes/clamav/Dockerfile b/web-api/runtimes/clamav/Dockerfile
@@ -40,6 +40,15 @@ RUN rpm2cpio bzip2-libs*.rpm | cpio -vimd
 RUN yumdownloader -x \*i686 --archlist=x86_64 xz-libs
 RUN rpm2cpio xz-libs*.rpm | cpio -vimd
 
+RUN yumdownloader -x \*i686 --archlist=x86_64 libprelude
+RUN rpm2cpio libprelude*.rpm | cpio -vimd
+
+RUN yumdownloader -x \*i686 --archlist=x86_64 gnutls
+RUN rpm2cpio gnutls*.rpm | cpio -vimd
+
+RUN yumdownloader -x \*i686 --archlist=x86_64 nettle
+RUN rpm2cpio nettle*.rpm | cpio -vimd
+
 RUN mkdir -p bin
 RUN mkdir -p lib
 RUN mkdir -p var/lib/clamav