From 0c43cef8fdc6008b01f247bbcdd93e9f5c635fdf Mon Sep 17 00:00:00 2001 From: Tom Yearke Date: Wed, 12 Apr 2017 16:35:31 -0400 Subject: [PATCH 1/9] Added change log for 6.6.0 --- CHANGELOG.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc8a8d1..684271f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,21 @@ Open XDMoD Application Kernels Change Log ========================================= +2017-04-?? v6.6.0 +----------------- + +- Miscellaneous + - Updated for compatibility with Open XDMoD 6.6.0 + ([\#14](https://github.com/ubccr/xdmod-appkernels/pull/14)) + - Cleaned up old and/or unused code + ([\#12](https://github.com/ubccr/xdmod-appkernels/pull/12)) + - Improved quality assurance + ([\#9](https://github.com/ubccr/xdmod-appkernels/pull/9), + [\#11](https://github.com/ubccr/xdmod-appkernels/pull/11), + [\#13](https://github.com/ubccr/xdmod-appkernels/pull/13), + [\#15](https://github.com/ubccr/xdmod-appkernels/pull/15), + [\#16](https://github.com/ubccr/xdmod-appkernels/pull/16)) + 2017-01-10 v6.5.0 ----------------- From b1ffae17d7835c6e52c5840df42da86a9adda25c Mon Sep 17 00:00:00 2001 From: "Jeffrey T. Palmer" Date: Mon, 17 Apr 2017 10:52:54 -0400 Subject: [PATCH 2/9] Update version numbers --- build.json | 2 +- configuration/portal_settings.ini | 2 +- xdmod-appkernels.spec.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.json b/build.json index 62bfe6c..7ae6833 100644 --- a/build.json +++ b/build.json @@ -1,6 +1,6 @@ { "name": "xdmod-appkernels", - "version": "6.5.0", + "version": "6.7.0", "release": "1.0", "files": { "include_paths": [ diff --git a/configuration/portal_settings.ini b/configuration/portal_settings.ini index 74e32cf..0467dd4 100644 --- a/configuration/portal_settings.ini +++ b/configuration/portal_settings.ini @@ -4,7 +4,7 @@ appkernels = "on" [appkernels-general] ; The version number is updated during the upgrade process. -version = "6.5.0" +version = "6.7.0" ; App kernel database and metric configuration. [appkernel] diff --git a/xdmod-appkernels.spec.in b/xdmod-appkernels.spec.in index c6d49b2..6485413 100644 --- a/xdmod-appkernels.spec.in +++ b/xdmod-appkernels.spec.in @@ -11,7 +11,7 @@ Source: %{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: php-cli -Requires: xdmod >= 6.5.0 +Requires: xdmod >= 6.7.0 %description This package provides application kernel support for Open XDMoD. The From 6fddc69a2e97dae445fd305592eeb71e5f12ce25 Mon Sep 17 00:00:00 2001 From: Jeanette Sperhac Date: Wed, 19 Apr 2017 14:02:44 -0400 Subject: [PATCH 3/9] Changed AppKernel namespace class from Resource to AKResource, comply with php7. --- classes/AppKernel/AppKernelDb.php | 4 ++-- classes/AppKernel/InstanceData.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/AppKernel/AppKernelDb.php b/classes/AppKernel/AppKernelDb.php index 8645de6..8789194 100644 --- a/classes/AppKernel/AppKernelDb.php +++ b/classes/AppKernel/AppKernelDb.php @@ -379,7 +379,7 @@ public function getResources($start_date = NULL, $end_date = NULL, array $pu_cou $resources = array(); foreach ( $results as $row ) { - $resource = new Resource; + $resource = new AKResource; $resource->id = $row['resource_id']; $resource->nickname = $row['nickname']; $resource->name = $row['resource']; @@ -683,7 +683,7 @@ public function loadResources(array $criteria = NULL) while ( FALSE !== ($row = current($result)) ) { - $resource = new Resource; + $resource = new AKResource; $resource->id = $row['resource_id']; $resource->nickname = $row['nickname']; $resource->name = $row['resource']; diff --git a/classes/AppKernel/InstanceData.php b/classes/AppKernel/InstanceData.php index 2c47995..2c708a9 100644 --- a/classes/AppKernel/InstanceData.php +++ b/classes/AppKernel/InstanceData.php @@ -500,7 +500,7 @@ class AppKernelDefinition // Resource that application kernels are run on // ================================================================================ -class Resource +class AKResource { public $id = NULL; // Database id public $nickname = NULL; // Resource nickname (e.g., short name such as "edge") @@ -508,7 +508,7 @@ class Resource public $description = NULL; // Resource description public $enabled = FALSE; // TRUE if the resoure is enabled public $visible = FALSE; // TRUE if visible outside of the application kernel tools -} // Resource +} // AKResource class ProcessingUnit { From d589f88a9000ca6ce9e6470926242cca97ef2c99 Mon Sep 17 00:00:00 2001 From: "Jeffrey T. Palmer" Date: Wed, 26 Apr 2017 14:56:21 -0400 Subject: [PATCH 4/9] Update asset configuration The added JavaScript asset was incorrectly being included in the base Open XDMoD package. --- configuration/assets.d/appkernels.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configuration/assets.d/appkernels.json b/configuration/assets.d/appkernels.json index dc9d7c5..292ca4e 100644 --- a/configuration/assets.d/appkernels.json +++ b/configuration/assets.d/appkernels.json @@ -39,7 +39,8 @@ "js/Arr/CreateSchedulePanel.js", "js/Arr/EditSchedulePanel.js", "js/Ingestion/AppKernelStore.js", - "js/Ingestion/AppKernelGrid.js" + "js/Ingestion/AppKernelGrid.js", + "js/Ingestion/ReportsPanel.js" ], "css": [ "css/appKer.css" From 4173cc6ed52aca290c38caf7fd9ac52ff92da0f7 Mon Sep 17 00:00:00 2001 From: "Jeffrey T. Palmer" Date: Fri, 5 May 2017 14:43:31 -0400 Subject: [PATCH 5/9] Update spec file for pre-release builds --- xdmod-appkernels.spec.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xdmod-appkernels.spec.in b/xdmod-appkernels.spec.in index 6485413..c883b19 100644 --- a/xdmod-appkernels.spec.in +++ b/xdmod-appkernels.spec.in @@ -7,8 +7,8 @@ Vendor: Center for Computational Research, University at Buffalo Packager: Jeffrey T. Palmer Group: Applications/Internet License: LGPLv3+ -Source: %{name}-%{version}.tar.gz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Source: %{name}-%{version}__PRERELEASE__.tar.gz +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}__PRERELEASE__-%{release}-XXXXXX) BuildArch: noarch BuildRequires: php-cli Requires: xdmod >= 6.7.0 @@ -29,7 +29,7 @@ to rely on users to report failures or underperforming hardware and software. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}__PRERELEASE__ %install rm -rf $RPM_BUILD_ROOT @@ -39,7 +39,7 @@ DESTDIR=$RPM_BUILD_ROOT ./install \ --libdir=%{_libdir}/xdmod \ --sysconfdir=%{_sysconfdir}/xdmod \ --datadir=%{_datadir}/xdmod \ - --docdir=%{_docdir}/%{name}-%{version} \ + --docdir=%{_docdir}/%{name}-%{version}__PRERELEASE__ \ --crondconfdir=%{_sysconfdir}/cron.d %clean @@ -50,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/xdmod-akrr-ingestor %{_libdir}/xdmod/ %{_datadir}/xdmod/ -%{_docdir}/%{name}-%{version}/ +%{_docdir}/%{name}-%{version}__PRERELEASE__/ %config(noreplace) %{_sysconfdir}/xdmod/*.d/appkernels.ini %config(noreplace) %{_sysconfdir}/xdmod/*.d/appkernels.json From c6895b19663c2160538119398f8c9fb0b1703ede Mon Sep 17 00:00:00 2001 From: Tom Yearke Date: Wed, 10 May 2017 13:27:55 -0400 Subject: [PATCH 6/9] Travis: Exclude redundant jobs --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4c88a47..d159823 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,9 @@ env: matrix: allow_failures: - env: TEST_SUITE=style + exclude: + - php: '5.4' + env: TEST_SUITE=style # Add dependency directories to the Travis cache cache: From 646ede6e27f7ea55beb04e7fca899a9998a52a69 Mon Sep 17 00:00:00 2001 From: "Jeffrey T. Palmer" Date: Wed, 10 May 2017 15:07:37 -0400 Subject: [PATCH 7/9] Update version numbers --- build.json | 2 +- configuration/portal_settings.ini | 2 +- xdmod-appkernels.spec.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.json b/build.json index 62bfe6c..c8c2122 100644 --- a/build.json +++ b/build.json @@ -1,6 +1,6 @@ { "name": "xdmod-appkernels", - "version": "6.5.0", + "version": "6.6.0", "release": "1.0", "files": { "include_paths": [ diff --git a/configuration/portal_settings.ini b/configuration/portal_settings.ini index 74e32cf..a4b2fc9 100644 --- a/configuration/portal_settings.ini +++ b/configuration/portal_settings.ini @@ -4,7 +4,7 @@ appkernels = "on" [appkernels-general] ; The version number is updated during the upgrade process. -version = "6.5.0" +version = "6.6.0" ; App kernel database and metric configuration. [appkernel] diff --git a/xdmod-appkernels.spec.in b/xdmod-appkernels.spec.in index c6d49b2..b90a65a 100644 --- a/xdmod-appkernels.spec.in +++ b/xdmod-appkernels.spec.in @@ -11,7 +11,7 @@ Source: %{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: php-cli -Requires: xdmod >= 6.5.0 +Requires: xdmod >= 6.6.0 %description This package provides application kernel support for Open XDMoD. The From 0a3814156ca1024de8afb9fa874817e85d5ce854 Mon Sep 17 00:00:00 2001 From: Tom Yearke Date: Wed, 10 May 2017 16:26:16 -0400 Subject: [PATCH 8/9] Updated 6.6.0 release notes, set expected release date --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 684271f..7cb5eb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,13 @@ Open XDMoD Application Kernels Change Log ========================================= -2017-04-?? v6.6.0 +2017-05-11 v6.6.0 ----------------- - Miscellaneous - Updated for compatibility with Open XDMoD 6.6.0 - ([\#14](https://github.com/ubccr/xdmod-appkernels/pull/14)) + ([\#14](https://github.com/ubccr/xdmod-appkernels/pull/14), + [\#19](https://github.com/ubccr/xdmod-appkernels/pull/19)) - Cleaned up old and/or unused code ([\#12](https://github.com/ubccr/xdmod-appkernels/pull/12)) - Improved quality assurance From 607ee769e0c9328dd29bf5e608cfac5f698c5c27 Mon Sep 17 00:00:00 2001 From: Tom Yearke Date: Thu, 11 May 2017 13:42:11 -0400 Subject: [PATCH 9/9] Added 6.6 change log notes to RPM spec file --- xdmod-appkernels.spec.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xdmod-appkernels.spec.in b/xdmod-appkernels.spec.in index c6d49b2..84075c5 100644 --- a/xdmod-appkernels.spec.in +++ b/xdmod-appkernels.spec.in @@ -59,6 +59,12 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/cron.d/%{name} %changelog +* Thu May 11 2017 Jeffrey T. Palmer 6.6.0-1.0 +- Miscellaneous + - Updated for compatibility with Open XDMoD 6.6.0 + - Cleaned up old and/or unused code + - Improved quality assurance + * Tue Jan 10 2017 Jeffrey T. Palmer 6.5.0-1.0 - Spun this module out from the Open XDMoD repository. * Wed Sep 21 2016 Jeffrey T. Palmer 6.0.0-1.0