Merge pull request #746 from bcgov/release/1.34.0

Merged PR-746
bcgov · Jun 14, 2018 · a6a6883 · a6a6883
2 parents 549625a + fcc886f
commit a6a6883
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -105,7 +105,7 @@ Map context = [
   stages:[
     'Build': true,
     'Unit Test': true,
-    'Code Quality': true,
+    'Code Quality': false,
     'Readiness - DEV': true,
     'Deploy - DEV': true,
     'Load Fixtures - DEV': true,
@@ -160,14 +160,14 @@ _stage('Unit Test', context) {
             try {
                 container('app') {
                     sh script: '''#!/usr/bin/container-entrypoint /bin/sh
-                        set -x
+                        set -eou pipefail
                         python --version
                         pip --version
                         node --version
                         npm --version
 
                         (cd /opt/app-root/src && python manage.py migrate)
-                        (cd /opt/app-root/src && export ENABLE_DATA_ENTRY="True" && export NOSE_PROCESSES=4 && python manage.py test -c nose.cfg)
+                        (cd /opt/app-root/src && export ENABLE_DATA_ENTRY="True" && python manage.py test -c nose.cfg)
                         (cd /opt/app-root/src/frontend && npm test)
                         mkdir -p frontend/test/
                         cp -R /opt/app-root/src/frontend/test/unit ./frontend/test/

diff --git a/app/registries/migrations/0006_auto_20180608_1934.py b/app/registries/migrations/0006_auto_20180608_1934.py
@@ -4,10 +4,10 @@
 
 from django.db import migrations
 
-from registries.models import RegistriesApplicationStatus, RegistriesApplication
-
 
 def update_application_status(apps, schema_editor):
+    RegistriesApplicationStatus = apps.get_model('registries', 'RegistriesApplicationStatus')
+    RegistriesApplication = apps.get_model('registries', 'RegistriesApplication')
     for application in RegistriesApplication.objects.all():
         pending = RegistriesApplicationStatus\
             .objects.filter(application=application,
@@ -41,6 +41,7 @@ def update_application_status(apps, schema_editor):
 
 
 def revert(apps, schema_editor):
+    RegistriesApplication = apps.get_model('registries', 'RegistriesApplication')
     for application in RegistriesApplication.objects.all():
         application.current_status = None
         application.application_recieved_date = None