Merge pull request #1109 from uw-it-aca/develop

Develop

Author: jlaney

.github/workflows/cicd.yml

@@ -130,6 +130,7 @@ jobs:
           python -m pip install --upgrade pip coverage coveralls==3.3.1
           coverage combine
           coveralls
+        continue-on-error: true
 
       - name: Push Image to Repository
         if: github.event_name == 'push'

Dockerfile

@@ -1,4 +1,4 @@
-ARG DJANGO_CONTAINER_VERSION=2.0.12
+ARG DJANGO_CONTAINER_VERSION=3.0.2
 
 FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-container:${DJANGO_CONTAINER_VERSION} AS app-container
 

docker/prod-values.yml

@@ -185,7 +185,7 @@ cronjob:
           cpu: 25m
           memory: 64Mi
     - name: import-courses-current
-      schedule: "5,20,35,50 13-23 * * 1-6"
+      schedule: "5,17,29,41,53 13-23 * * 1-6"
       command: ["/scripts/management_command.sh"]
       args: ["import_courses", "1", "current"]
       resources:
@@ -196,7 +196,7 @@ cronjob:
           cpu: 25m
           memory: 128Mi
     - name: import-courses-next
-      schedule: "10,25,40,55 13-23 * * 1-6"
+      schedule: "1,13,25,37,49 13-23 * * 1-6"
       command: ["/scripts/management_command.sh"]
       args: ["import_courses", "1", "next"]
       resources:
@@ -417,6 +417,8 @@ environmentVariables:
     value: PROD
   - name: SWS_TIMEOUT
     value: "10"
+  - name: SWS_THREAD_POOL_SIZE
+    value: "30"
 
   - name: GWS_ENV
     value: PROD

sis_provisioner/test/models/test_course.py

@@ -51,7 +51,7 @@ def test_add_to_queue(self):
 
         # Add archived course to queue
         course.queue_id = None
-        course.archived_date = datetime.now()
+        course.archived_date = datetime.now(timezone.utc)
         course.save()
         self.assertRaises(CoursePolicyException,
                           Course.objects.add_to_queue, section, queue_id=2)