Merge pull request #1696 from jpwhite4/version_up

Update version number to 10.0.1
ubccr · Mar 17, 2023 · 3ec0a24 · 3ec0a24
2 parents 6b0bc1c + 98ab34f
commit 3ec0a24
Show file tree

Hide file tree

Showing 10 changed files with 101 additions and 26 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,9 +8,12 @@ executors:
   centos7: &centos7-executor
     docker:
       - image: tools-ext-01.ccr.xdmod.org/xdmod-9.5.0:centos7.9-0.3
-  centos8: &centos8-executor
+  centos7-10_0_0: &centos7-1000-executor
     docker:
-      - image: tools-ext-01.ccr.xdmod.org/centos8.4:base
+      - image: tools-ext-01.ccr.xdmod.org/xdmod-10.0.0:centos7.9-0.6
+  rocky8: &rocky8-executor
+    docker:
+      - image: tools-ext-01.ccr.xdmod.org/xdmod10.0:rockylinux8.5-0.5
 jobs:
   build:
     parameters:
@@ -40,12 +43,15 @@ jobs:
       # Download and cache dependencies
       - when:
           condition:
-            equal: [ *centos8-executor, << parameters.os >> ]
+            equal: [ *rocky8-executor, << parameters.os >> ]
           steps:
             - run:
-                name: Setup Environment Variables for centos8
+                name: Setup Environment Variables for Rocky8
                 command: |
                   echo "export COMPOSER=composer-el8.json" >> $BASH_ENV
+            - run:
+                  name: install the composer dependencies
+                  command: composer install
             - restore_cache:
                 keys:
                   # "composer.lock" can be used if it is committed to the repo
@@ -58,7 +64,9 @@ jobs:
                   - ./vendor
       - when:
           condition:
-            equal: [ *centos7-executor, << parameters.os >> ]
+            or:
+              - equal: [ *centos7-executor, << parameters.os >> ]
+              - equal: [ *centos7-1000-executor, << parameters.os >> ]
           steps:
             - run:
                 name: Setup Environment Variables for centos7
@@ -98,7 +106,6 @@ jobs:
           name: Setup & Run QA Tests
           command: |
             ./tests/ci/scripts/qa-test-setup.sh
-      - run: ./tests/regression/runtests.sh
       - run:
           name: Setup Configuration Files for Integration Tests
           command: |
@@ -111,23 +118,39 @@ jobs:
       - run: ./tests/component/runtests.sh --junit-output-dir ~/phpunit
       - when:
           condition:
-            equal: [ *centos8-executor, << parameters.os >> ]
+            equal: [ *centos7-executor, << parameters.os >> ]
           steps:
             - run:
-                name: Install new chromedriver
+                name: 'Run SSO Tests'
                 command: |
-                  pushd /root/project/tests/ui
-                  rm -rf node_modules
-                  rm -f package-lock.json
-                  npm install
-                  popd
-      - run: ./tests/ui/runtests.sh --headless --log-junit ~/phpunit
-      - run:
-          name: 'Run SSO Tests'
-          command: |
-            ./tests/ci/samlSetup.sh
-            ./tests/ui/runtests.sh --headless --log-junit ~/phpunit --sso
-            ./vendor/phpunit/phpunit/phpunit -c ./tests/integration/phpunit.xml.dist --testsuite sso --log-junit ~/phpunit/xdmod-sso-integration.xml
+                  ./tests/ci/samlSetup.sh
+                  ./tests/ui/runtests.sh --headless --log-junit ~/phpunit --sso
+                  ./vendor/phpunit/phpunit/phpunit -c ./tests/integration/phpunit.xml.dist --testsuite sso --log-junit ~/phpunit/xdmod-sso-integration.xml
+      - when:
+          condition:
+            equal: [ *centos7-1000-executor, << parameters.os >> ]
+          steps:
+            - run: scl enable rh-nodejs6 "./tests/ui/runtests.sh --headless --log-junit ~/phpunit"
+            - run:
+                name: 'Run SSO Tests'
+                command: |
+                  scl enable rh-nodejs6 "./tests/ci/samlSetup.sh"
+                  scl enable rh-nodejs6 "./tests/ui/runtests.sh --headless --log-junit ~/phpunit --sso"
+                  ./vendor/phpunit/phpunit/phpunit -c ./tests/integration/phpunit.xml.dist --testsuite sso --log-junit ~/phpunit/xdmod-sso-integration.xml
+      - when:
+          condition:
+            or:
+              - equal: [ *rocky8-executor, << parameters.os >> ]
+          steps:
+            - run: pushd $HOME && rm -f chromedriver_linux64.zip && wget https://chromedriver.storage.googleapis.com/106.0.5249.61/chromedriver_linux64.zip && popd
+            - run: pushd ./tests/ui && npm install && popd
+            - run: ./tests/ui/runtests.sh --headless --log-junit ~/phpunit
+            - run:
+                name: 'Run SSO Tests'
+                command: |
+                  ./tests/ci/samlSetup.sh
+                  ./tests/ui/runtests.sh --headless --log-junit ~/phpunit --sso
+                  ./vendor/phpunit/phpunit/phpunit -c ./tests/integration/phpunit.xml.dist --testsuite sso --log-junit ~/phpunit/xdmod-sso-integration.xml
       - run:
           name: Ensure that no unexpected Apache errors were generated
           command: test `fgrep -v ' [ssl:warn] ' /var/log/xdmod/apache-error.log | wc -l` = 0
@@ -144,8 +167,8 @@ workflows:
       - build:
           matrix:
             parameters:
-              os: [centos7, centos8]
+              os: [centos7, centos7-10_0_0, rocky8]
               install-type: ["fresh_install", "upgrade"]
             exclude:
-              - os: centos8
+              - os: rocky8
                 install-type: "upgrade"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Open XDMoD Change Log
 
+## 2023-03-10 v10.0.1
+
+- Bug Fixes
+    - General
+        - Update image export to support headless chromium 109 or later ([\#1688](https://github.com/ubccr/xdmod/pull/1688))
+- Uncategorized
+    - General
+        - Merge code updates to support Rocky 8 into single branch that supports both Centos 7 and Rocky 8 builds.
+
 ## 2022-03-10 v10.0.0
 
 - Bug Fixes

diff --git a/bin/xdmod-upgrade b/bin/xdmod-upgrade
@@ -26,7 +26,8 @@ ini_set('memory_limit', -1);
  * @var array
  */
 $supportedUpgrades = array(
-    '9.5.0' => '10.0.0'
+    '9.5.0' => '10.0.0',
+    '10.0.0' => '10.0.1'
 );
 
 /**

diff --git a/classes/OpenXdmod/Migration/Version1000To1001/ConfigFilesMigration.php b/classes/OpenXdmod/Migration/Version1000To1001/ConfigFilesMigration.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Update config files from version 10.0.0 To 10.0.1.
+ */
+
+namespace OpenXdmod\Migration\Version1000To1001;
+
+use OpenXdmod\Migration\ConfigFilesMigration as AbstractConfigFilesMigration;
+
+class ConfigFilesMigration extends AbstractConfigFilesMigration
+{
+
+    /**
+     * Update portal_settings.ini with the new version number.
+     */
+    public function execute()
+    {
+        $this->assertPortalSettingsIsWritable();
+        $this->writePortalSettingsFile();
+    }
+}
diff --git a/configuration/portal_settings.ini b/configuration/portal_settings.ini
@@ -6,7 +6,7 @@ contact_page_recipient = ""
 tech_support_recipient = ""
 
 ; The version number is updated during the upgrade process.
-version = "10.0.0"
+version = "10.0.1"
 
 debug_mode = "off"
 debug_recipient = ""

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -37,7 +37,7 @@ defaults:
     values:
       layout: "page"
       prev_sw_version: "9.5.0"
-      sw_version: "10.0.0"
+      sw_version: "10.0.1"
       style: "effervescence"
       tocversion: "toc"
 

diff --git a/docs/upgrade.md b/docs/upgrade.md
@@ -136,5 +136,13 @@ Notes](resource-manager-slurm.html#input-format) for the example `sacct`
 command.  If you are using the `xdmod-slurm-helper` command then no changes are
 necessary.
 
+10.0.1 Upgrade Notes
+-------------------
+
+Open XDMoD 10.0.1 is a bug fix release that fixes a compatibility issue with
+headless chromium (used for image export and report generation).
+
+You may upgrade directly from 9.5.0 or 10.0.0
+
 [github-latest-release]: https://github.com/ubccr/xdmod/releases/latest
 [mysql-config]: configuration.md#mysql-configuration
diff --git a/html/about/release_notes/xdmod.html b/html/about/release_notes/xdmod.html
@@ -2,6 +2,17 @@ <h1>Open XDMoD Release Notes</h1>
 
 <p>Below is a list of Open XDMoD releases with major features and bug fixes listed.</p>
 
+<h2>Version 10.0.0 (2022-03-10)</h2>
+<ul>
+    <li>Bug Fixes</li>
+    <ul>
+        <li>ETL</li>
+        <ul>
+            <li>Update image export for compatilibity with headless chromium 109 or later</li>
+        </ul>
+    </ul>
+</ul>
+
 <h2>Version 10.0.0 (2022-03-10)</h2>
 <ul>
 <li>Bug Fixes

diff --git a/open_xdmod/modules/xdmod/build.json b/open_xdmod/modules/xdmod/build.json
@@ -1,6 +1,6 @@
 {
     "name": "xdmod",
-    "version": "10.0.0",
+    "version": "10.0.1",
     "release": "1.0",
     "files": {
         "include_paths": [

diff --git a/open_xdmod/modules/xdmod/xdmod.spec.in b/open_xdmod/modules/xdmod/xdmod.spec.in
@@ -99,6 +99,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %attr(0570,apache,xdmod) %{xdmod_export_dir}
 
 %changelog
+* Fri Mar 10 2023 XDMoD <ccr-xdmod-list@listserv.buffalo.edu> 10.0.1-1.0
+    - Release 10.0.1
 * Thu Mar 10 2022 XDMoD <ccr-xdmod-list@listserv.buffalo.edu> 10.0.0-1.0
     - Release 10.0.0
     - Remove `php-pear-MDB2` and `php-pear-MDB2-Driver-mysql` from required dependencies