Merge pull request #94 from jtpalmer/xdmod-10.5

10.5 boilerplate
ubccr · Jul 6, 2023 · 6c53216 · 6c53216
2 parents 32c1165 + ef5a91a
commit 6c53216
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 executors:
   centos7:
     docker:
-      - image: tools-ext-01.ccr.xdmod.org/xdmod-9.5.0:centos7.9-1.0
+      - image: tools-ext-01.ccr.xdmod.org/xdmod-10.0.0:centos7.9-0.6
   centos8: &centos8-executor
     docker:
       - image: tools-ext-01.ccr.xdmod.org/centos8-0.1:base
@@ -19,7 +19,7 @@ jobs:
     environment:
       COMPOSER_ALLOW_SUPERUSER: 1
       XDMOD_REALMS: 'jobs,storage'
-      XDMOD_BRANCH: xdmod10.0
+      XDMOD_BRANCH: xdmod10.5
       XDMOD_MODULE_NAME: appkernels
       XDMOD_IS_CORE: yes
       XDMOD_INSTALL_DIR: /xdmod

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 Open XDMoD Application Kernels Change Log
 =========================================
 
+## XXXX-XX-XX v10.5.0
+
 ## 2022-03-10 v10.0.0
 
 - Bug Fixes

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM tools-ext-01.ccr.xdmod.org/xdmod-9.5.0:centos7.9-1.0
+FROM tools-ext-01.ccr.xdmod.org/xdmod-10.0.0:centos7.9-0.6
 
 # install python3 for akrr build
 RUN yum -y install --setopt=tsflags=nodocs python3
diff --git a/build.json b/build.json
@@ -1,6 +1,6 @@
 {
     "name": "xdmod-appkernels",
-    "version": "10.0.0",
+    "version": "10.5.0",
     "release": "1.0",
     "files": {
         "include_paths": [

diff --git 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 = "10.0.0"
+version = "10.5.0"
 
 ; App kernel database and metric configuration.
 [appkernel]

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -35,8 +35,8 @@ defaults:
       type: "pages"
     values:
       layout: "page"
-      version: "10.0"
-      sw_version: "10.0.0"
+      version: "10.5"
+      sw_version: "10.5.0"
       style: "effervescence"
       tocversion: "toc"
 

diff --git a/shippable.yml b/shippable.yml
@@ -3,7 +3,7 @@ env:
     global:
         - COMPOSER_ALLOW_SUPERUSER=1
         - XDMOD_REALMS='jobs,storage'
-        - XDMOD_BRANCH=xdmod10.0
+        - XDMOD_BRANCH=xdmod10.5
         - XDMOD_SOURCE_DIR=$SHIPPABLE_BUILD_DIR/../xdmod
         - XDMOD_INSTALL_DIR=/xdmod
         - XDMOD_MODULE_DIR=$SHIPPABLE_BUILD_DIR

diff --git a/tests/README.md b/tests/README.md
@@ -10,7 +10,7 @@ Run Tests with specific XDMoD branch
 
 ```shell script
 docker run -it --rm -p 20080:8080 \
-    -e XDMOD_BRANCH=xdmod10.0 \
+    -e XDMOD_BRANCH=xdmod10.5 \
     pseudo_repo/xdmod-appkernels-tests:latest
 ```
 
@@ -24,7 +24,7 @@ Same without rebuilding image by attaching host directory
 ```shell script
 # in xdmod-appkernels directory
 docker run -it --rm -p 20080:8080 \
-    -e XDMOD_BRANCH=xdmod10.0 \
+    -e XDMOD_BRANCH=xdmod10.5 \
     -v `pwd`:/root/src/ubccr/xdmod-appkernels \
     pseudo_repo/xdmod-appkernels-tests:latest
 ```
@@ -34,7 +34,7 @@ Using local XDMoD and adding remote debugging capabilities with port forwarding
 # in xdmod-appkernels directory
 docker run -it --rm \
     -p 20443:443 -p 23306:3306 -p 20022:22 \
-    -e XDMOD_BRANCH=xdmod10.0 \
+    -e XDMOD_BRANCH=xdmod10.5 \
     -v `pwd`/../xdmod:/root/src/ubccr/xdmod \
     -v `pwd`/../xdmod-qa:/root/src/ubccr/xdmod-qa \
     -v `pwd`:/root/src/ubccr/xdmod-appkernels \

diff --git a/xdmod-appkernels.spec.in b/xdmod-appkernels.spec.in
@@ -11,7 +11,7 @@ Source:        %{name}-%{version}__PRERELEASE__.tar.gz
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}__PRERELEASE__-%{release}-XXXXXX)
 BuildArch:     noarch
 BuildRequires: php-cli
-Requires:      xdmod >= 10.0.0, xdmod < 10.1.0
+Requires:      xdmod >= 10.5.0, xdmod < 10.6.0
 
 %description
 This package provides application kernel support for Open XDMoD. The