diff --git a/.gitignore b/.gitignore index 2fa4d31cbf..43ab47988b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ awx/settings/local_settings.py* awx/*.sqlite3 awx/projects -awx/job_status +awx/job_output awx/public/media awx/public/static awx/ui/static/js/awx.min.js diff --git a/awx/main/tests/activity_stream.py b/awx/main/tests/activity_stream.py index 6dc4cc47ce..a2e233569e 100644 --- a/awx/main/tests/activity_stream.py +++ b/awx/main/tests/activity_stream.py @@ -42,7 +42,8 @@ class ActivityStreamTest(BaseTest): self.check_pagination_and_size(response, 1, previous=None, next=None) def test_basic_fields(self): - org_item = self.item(1) + item_id = ActivityStream.objects.order_by('pk')[0].pk + org_item = self.item(item_id) with self.current_user(self.super_django_user): response = self.get(org_item, expect=200) @@ -54,7 +55,8 @@ class ActivityStreamTest(BaseTest): self.assertTrue(response['summary_fields']['organization'][0]['name'] == self.org_created['name']) def test_changeby_user(self): - org_item = self.item(1) + item_id = ActivityStream.objects.order_by('pk')[0].pk + org_item = self.item(item_id) with self.current_user(self.super_django_user): response = self.get(org_item, expect=200) diff --git a/requirements/dev.txt b/requirements/dev.txt index 5043dbf658..10aa849e52 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -27,7 +27,7 @@ Django>=1.4 django-debug-toolbar django-devserver unittest2 -django-jenkins +django-jenkins<0.15 ipython # You may also need to install the following extra packages using the OS diff --git a/requirements/dev_local.txt b/requirements/dev_local.txt index 75115b1e6c..ab6c65bd34 100644 --- a/requirements/dev_local.txt +++ b/requirements/dev_local.txt @@ -86,7 +86,7 @@ pylint-1.1.0.tar.gz # Remaining dev-only packages: django-debug-toolbar-1.0.1.tar.gz django-devserver-0.7.0.tar.gz -django-jenkins-0.15.0.tar.gz +django-jenkins-0.14.1.tar.gz ipython-1.2.1.tar.gz # You may also need to install the following extra packages using the OS diff --git a/requirements/django-jenkins-0.14.1.tar.gz b/requirements/django-jenkins-0.14.1.tar.gz new file mode 100644 index 0000000000..656ef7121e Binary files /dev/null and b/requirements/django-jenkins-0.14.1.tar.gz differ diff --git a/requirements/django-jenkins-0.15.0.tar.gz b/requirements/django-jenkins-0.15.0.tar.gz deleted file mode 100644 index 37165dd16d..0000000000 Binary files a/requirements/django-jenkins-0.15.0.tar.gz and /dev/null differ