summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS12
-rw-r--r--artifact_store.py4
-rwxr-xr-xcheck39
-rw-r--r--debian/changelog10
-rw-r--r--ick2/buildsapi.py4
-rw-r--r--ick2/persistent.py8
-rw-r--r--ick2/persistent_tests.py6
-rw-r--r--ick2/trans.py5
-rw-r--r--ick2/version.py4
-rw-r--r--notification_service.py4
-rwxr-xr-xstart_ick4
11 files changed, 53 insertions, 47 deletions
diff --git a/NEWS b/NEWS
index 170b67e..ed6c79b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
NEWS for ick2, a CI server
=============================================================================
-Copyright 2017-2018 Lars Wirzenius
+Copyright 2017-2019 Lars Wirzenius
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -17,9 +17,17 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Version 0.53.2+git, not yet released
+Version 0.55+git, not yet released
+----------------------------------
+
+
+Version 0.54, released 2019-07-26
------------------------------------
+* A ton of changes. This NEWS entry isn't complete, sorry. I'm making
+ a release before merging in a large change to how the controller
+ stores persistent data.
+
* The worker manager now has an action to mirror several git
repositories at once: `action: git_mirror`. See
[the specification][].
diff --git a/artifact_store.py b/artifact_store.py
index ea1db6a..8dea22d 100644
--- a/artifact_store.py
+++ b/artifact_store.py
@@ -1,5 +1,5 @@
#!/usr/bin/python3
-# Copyright (C) 2018 Lars Wirzenius
+# Copyright (C) 2018-2019 Lars Wirzenius
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -120,4 +120,4 @@ app = main()
if __name__ == '__main__':
print('running in debug mode')
- app.run(host='127.0.0.1', port=12766)
+ app.run(host='127.0.0.1', port=5555)
diff --git a/check b/check
index 1e98ee1..ad8b49c 100755
--- a/check
+++ b/check
@@ -31,11 +31,13 @@ title()
title Remote yarns?
+local=yes
yarns=no
if [ "$#" -gt 0 ]
then
case "$1" in
https://*)
+ local=no
yarns=yes
remote_url="$1"
shift 1
@@ -48,29 +50,32 @@ then
fi
-title Unit tests
-python3 -m CoverageTestRunner --ignore-missing-from=without-tests ick2
-
-if [ -e .git ]
+if [ "$local" = yes ]
then
- sources="$(git ls-files | grep -Fvxf copyright-exceptions)"
+ title Unit tests
+ python3 -m CoverageTestRunner --ignore-missing-from=without-tests ick2
- title Copyright statements
- copyright-statement-lint $sources
+ if [ -e .git ]
+ then
+ sources="$(git ls-files | grep -Fvxf copyright-exceptions)"
- title Copyright licences
- ./is-agpl3+ $sources
-fi
+ # title Copyright statements
+ # copyright-statement-lint $sources
-python_sources="ick_controller.py worker_manager ick2 icktool"
+ title Copyright licences
+ ./is-agpl3+ $sources
+ fi
-title pycodestyle
-pycodestyle ick2 $python_sources
+ python_sources="ick_controller.py worker_manager ick2 icktool"
-if command -v pylint3 > /dev/null
-then
- title pylint3
- pylint3 --rcfile pylint.conf $python_sources
+ title pycodestyle
+ pycodestyle ick2 $python_sources
+
+ # if command -v pylint3 > /dev/null
+ # then
+ # title pylint3
+ # pylint3 --rcfile pylint.conf $python_sources
+ # fi
fi
if [ "$yarns" = yes ]
diff --git a/debian/changelog b/debian/changelog
index 5e1e63c..a80d091 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-ick2 (0.53.2+git-1) UNRELEASED; urgency=medium
+ick2 (0.55+git-1) UNRELEASED; urgency=medium
* New upstream version.
- -- Lars Wirzenius <liw@liw.fi> Wed, 18 Jul 2018 20:03:56 +0300
+ -- Lars Wirzenius <liw@liw.fi> Fri, 26 Jul 2019 09:11:54 +0300
+
+ick2 (0.54-1) stretch; urgency=medium
+
+ * New upstream version.
+
+ -- Lars Wirzenius <liw@liw.fi> Fri, 26 Jul 2019 09:11:53 +0300
ick2 (0.53.2-1) stretch; urgency=medium
diff --git a/ick2/buildsapi.py b/ick2/buildsapi.py
index 8862c63..2efc3d1 100644
--- a/ick2/buildsapi.py
+++ b/ick2/buildsapi.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018 Lars Wirzenius
+# Copyright (C) 2017-2019 Lars Wirzenius
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -60,7 +60,7 @@ class BuildsAPI(ick2.ResourceApiBase): # pragma: no cover
raise ick2.MethodNotAllowed('Updating builds directly is not allowed')
def list(self, **kwargs):
- result = super().list()
+ result = super().list(**kwargs)
items = result[self._type_name]
items.sort(key=lambda x: x.get('build_number'))
result[self._type_name] = items
diff --git a/ick2/persistent.py b/ick2/persistent.py
index c5e2840..1d79e3d 100644
--- a/ick2/persistent.py
+++ b/ick2/persistent.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 Lars Wirzenius
+# Copyright (C) 2018-2019 Lars Wirzenius
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -27,9 +27,6 @@ import ick2
class PersistentStateInterface: # pragma: no cover
- def get_resource_kinds(self):
- raise NotImplementedError()
-
def get_resource_ids(self, kind):
raise NotImplementedError()
@@ -79,9 +76,6 @@ class FilePersistentState(PersistentStateInterface):
dirname = self._dirname(kind)
return os.path.join(dirname, self._safe(rid))
- def get_resource_kinds(self):
- return self._unsafe_list(os.listdir(self._dir))
-
def has_resource(self, kind, rid):
filename = self._filename(kind, rid)
return os.path.exists(filename)
diff --git a/ick2/persistent_tests.py b/ick2/persistent_tests.py
index 8acb141..de279a1 100644
--- a/ick2/persistent_tests.py
+++ b/ick2/persistent_tests.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 Lars Wirzenius
+# Copyright (C) 2018-2019 Lars Wirzenius
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -35,9 +35,6 @@ class FilePersistentStateTests(unittest.TestCase):
def test_returns_dirname(self):
self.assertEqual(self.state.get_directory(), self.tempdir)
- def test_has_no_resource_kinds_initially(self):
- self.assertEqual(self.state.get_resource_kinds(), [])
-
def test_has_no_resources_initially(self):
self.assertEqual(self.state.get_resource_ids('silly'), [])
@@ -50,7 +47,6 @@ class FilePersistentStateTests(unittest.TestCase):
r = ick2.resource_from_dict(as_dict)
self.state.write_resource('silly', '#1', r)
self.assertTrue(self.state.has_resource('silly', '#1'))
- self.assertEqual(self.state.get_resource_kinds(), ['silly'])
self.assertEqual(self.state.get_resource_ids('silly'), ['#1'])
r2 = self.state.get_resource('silly', '#1')
diff --git a/ick2/trans.py b/ick2/trans.py
index f1c8e5e..c5dc22f 100644
--- a/ick2/trans.py
+++ b/ick2/trans.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 Lars Wirzenius
+# Copyright (C) 2018-2019 Lars Wirzenius
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -59,9 +59,6 @@ class TransactionalState:
raise ick2.NotFound(kind=kind, rid=rid)
return TransactionalResource(self.state, kind, rid)
- def get_resource_kinds(self):
- return self.state.get_resource_kinds()
-
def get_resource_ids(self, kind):
return self.state.get_resource_ids(kind)
diff --git a/ick2/version.py b/ick2/version.py
index 4c6e147..27b4c9b 100644
--- a/ick2/version.py
+++ b/ick2/version.py
@@ -1,2 +1,2 @@
-__version__ = "0.53.2+git"
-__version_info__ = (0, 53, 2, '+git')
+__version__ = "0.55+git"
+__version_info__ = (0, 55, '+git')
diff --git a/notification_service.py b/notification_service.py
index bd6bad1..f8e5c55 100644
--- a/notification_service.py
+++ b/notification_service.py
@@ -1,5 +1,5 @@
#!/usr/bin/python3
-# Copyright (C) 2018 Lars Wirzenius
+# Copyright (C) 2018-2019 Lars Wirzenius
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -123,4 +123,4 @@ app = main()
if __name__ == '__main__':
print('running in debug mode')
- app.run(host='127.0.0.1', port=12767)
+ app.run(host='127.0.0.1', port=6666)
diff --git a/start_ick b/start_ick
index 8c9d50f..9939e01 100755
--- a/start_ick
+++ b/start_ick
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2017-2018 Lars Wirzenius
+# Copyright (C) 2017-2019 Lars Wirzenius
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -26,7 +26,7 @@ else
fi
gunicorn3 \
- --bind 127.0.0.1:12765 \
+ --bind 127.0.0.1:3333 \
--log-file "$GUNICORN_LOG" \
--log-level debug \
ick_controller:app