Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dCache/dcache
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 10.2.2
Choose a base ref
...
head repository: dCache/dcache
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 2,211 additions and 2,077 deletions.
  1. +150 −0 .ci/generate-releases-xml.sh
  2. +17 −16 .github/workflows/mirror.yml
  3. +27 −3 .gitlab-ci.yml
  4. +1 −1 archetypes/dcache-nearline-plugin-archetype/pom.xml
  5. +1 −1 archetypes/pom.xml
  6. +1 −1 docs/TheBook/pom.xml
  7. +131 −1,063 docs/TheBook/src/main/markdown/dcache-minimal-installation.md
  8. +3 −4 docs/TheBook/src/main/markdown/install.md
  9. +1 −1 docs/UserGuide/pom.xml
  10. +1 −1 docs/pom.xml
  11. +1 −1 modules/acl-vehicles/pom.xml
  12. +1 −1 modules/acl/pom.xml
  13. +1 −1 modules/benchmarks/pom.xml
  14. +1 −1 modules/cells/pom.xml
  15. +10 −5 modules/cells/src/main/java/dmg/cells/network/LocationManagerConnector.java
  16. +26 −209 modules/cells/src/main/java/dmg/cells/services/LocationManager.java
  17. +1 −6 modules/chimera/pom.xml
  18. +9 −1 modules/chimera/src/main/java/org/dcache/chimera/FsSqlDriver.java
  19. +1 −0 modules/chimera/src/main/java/org/dcache/chimera/JdbcFs.java
  20. +71 −0 modules/chimera/src/main/resources/org/dcache/chimera/changelog/00-liquibase-fixes.xml
  21. +5 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changelog-master.xml
  22. +10 −10 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-1.8.0.xml
  23. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-1.9.12.xml
  24. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-1.9.13.xml
  25. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-1.9.2.xml
  26. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-1.9.3.xml
  27. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-10.xml
  28. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-2.10.xml
  29. +4 −4 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-2.13.xml
  30. +5 −5 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-2.14.xml
  31. +23 −23 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-2.15.xml
  32. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-2.3.xml
  33. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-2.7.xml
  34. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-2.8.xml
  35. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-2.9.xml
  36. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-3.1.xml
  37. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-5.2.xml
  38. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-6.0.xml
  39. +2 −2 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-6.2.xml
  40. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-7.1.xml
  41. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-7.2.xml
  42. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-8.2.xml
  43. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-9.1.xml
  44. +1 −1 modules/chimera/src/main/resources/org/dcache/chimera/changelog/changeset-9.2.xml
  45. +6 −1 modules/common-cli/pom.xml
  46. +1 −1 modules/common-security/pom.xml
  47. +1 −1 modules/common/pom.xml
  48. +1 −1 modules/dcache-bulk/pom.xml
  49. +3 −2 modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/BulkActivity.java
  50. +3 −2 ...les/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/delete/DeleteActivity.java
  51. +1 −1 ...les/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/log/LogTargetActivity.java
  52. +7 −6 modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/PinActivity.java
  53. +4 −5 ...es/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/PinManagerActivity.java
  54. +4 −2 modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/ReleaseActivity.java
  55. +10 −8 modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/StageActivity.java
  56. +4 −2 modules/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/pin/UnpinActivity.java
  57. +20 −8 ...les/dcache-bulk/src/main/java/org/dcache/services/bulk/activity/plugin/qos/UpdateQoSActivity.java
  58. +18 −58 modules/dcache-bulk/src/main/java/org/dcache/services/bulk/job/BulkRequestContainerJob.java
  59. +1 −0 modules/dcache-bulk/src/main/java/org/dcache/services/bulk/manager/ConcurrentRequestManager.java
  60. +8 −5 modules/dcache-bulk/src/main/java/org/dcache/services/bulk/util/BulkRequestTarget.java
  61. +1 −1 modules/dcache-bulk/src/main/resources/org/dcache/services/bulk/bulk.xml
  62. +3 −3 modules/dcache-bulk/src/main/resources/org/dcache/services/bulk/model/db.changelog-8.0.xml
  63. +9 −9 modules/dcache-bulk/src/main/resources/org/dcache/services/bulk/model/db.changelog-9.0.xml
  64. +1 −1 modules/dcache-bulk/src/main/resources/org/dcache/services/bulk/model/db.changelog-9.2.xml
  65. +1 −1 modules/dcache-bulk/src/main/resources/org/dcache/services/bulk/model/db.changelog-master.xml
  66. +1 −1 modules/dcache-chimera/pom.xml
  67. +1 −1 modules/dcache-chimera/src/main/java/org/dcache/chimera/namespace/ChimeraNameSpaceProvider.java
  68. +8 −1 modules/dcache-chimera/src/main/resources/diskCacheV111/namespace/pnfsmanager-chimera.xml
  69. +1 −1 modules/dcache-dcap/pom.xml
  70. +1 −1 modules/dcache-frontend/pom.xml
  71. +18 −4 modules/dcache-frontend/src/main/java/org/dcache/restful/resources/bulk/BulkResources.java
  72. +5 −7 modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/ArchiveInfoResources.java
  73. +5 −3 modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/ReleaseResources.java
  74. +8 −2 modules/dcache-frontend/src/main/java/org/dcache/restful/resources/tape/StageResources.java
  75. +19 −4 modules/dcache-frontend/src/main/java/org/dcache/restful/util/wlcg/ArchiveInfoCollector.java
  76. +2 −1 ...les/dcache-frontend/src/test/java/org/dcache/restful/resources/bulk/BulkRequestJsonParseTest.java
  77. +1 −1 modules/dcache-ftp/pom.xml
  78. +1 −1 modules/dcache-gplazma/pom.xml
  79. +1 −1 modules/dcache-history/pom.xml
  80. +1 −1 modules/dcache-info/pom.xml
  81. +1 −1 modules/dcache-nearline-spi/pom.xml
  82. +1 −1 modules/dcache-nfs/pom.xml
  83. +8 −1 modules/dcache-nfs/src/main/resources/org/dcache/chimera/nfsv41/door/nfsv41-common.xml
  84. +1 −1 modules/dcache-qos/pom.xml
  85. +2 −1 modules/dcache-qos/src/main/java/org/dcache/qos/services/adjuster/adjusters/CopyAdjuster.java
  86. +7 −29 modules/dcache-qos/src/main/java/org/dcache/qos/services/engine/provider/PolicyBasedQoSProvider.java
  87. +1 −1 modules/dcache-qos/src/main/resources/org/dcache/qos/model/db.changelog-8.0.xml
  88. +1 −1 modules/dcache-qos/src/main/resources/org/dcache/qos/model/db.changelog-9.2.xml
  89. +1 −1 modules/dcache-qos/src/main/resources/org/dcache/qos/model/db.changelog-master.xml
  90. +1 −1 modules/dcache-qos/src/main/resources/org/dcache/qos/qos-adjuster.xml
  91. +1 −1 modules/dcache-resilience/pom.xml
  92. +2 −1 modules/dcache-resilience/src/main/java/org/dcache/resilience/handlers/FileOperationHandler.java
  93. +1 −1 modules/dcache-spacemanager/pom.xml
  94. +1 −1 ...he-spacemanager/src/main/resources/diskCacheV111/services/space/db/spacemanager.changelog-2.8.xml
  95. +7 −7 ...he-spacemanager/src/main/resources/diskCacheV111/services/space/db/spacemanager.changelog-2.9.xml
  96. +1 −1 ...spacemanager/src/main/resources/diskCacheV111/services/space/db/spacemanager.changelog-master.xml
  97. +1 −1 modules/dcache-srm/pom.xml
  98. +3 −2 modules/dcache-srm/src/main/java/diskCacheV111/srm/dcache/Storage.java
  99. +1 −1 modules/dcache-vehicles/pom.xml
  100. +14 −0 modules/dcache-vehicles/src/main/java/diskCacheV111/util/DiskErrorCacheException.java
  101. +35 −7 modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/HttpProtocolInfo.java
  102. +40 −8 modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/RemoteHttpDataTransferProtocolInfo.java
  103. +28 −8 ...les/dcache-vehicles/src/main/java/diskCacheV111/vehicles/RemoteHttpsDataTransferProtocolInfo.java
  104. +8 −1 modules/dcache-vehicles/src/main/java/org/dcache/util/FileAttributesBuilder.java
  105. +1 −1 modules/dcache-vehicles/src/main/java/org/dcache/vehicles/FileAttributes.java
  106. +1 −1 modules/dcache-webdav/pom.xml
  107. +4 −1 modules/dcache-webdav/src/main/java/org/dcache/webdav/DcacheResourceFactory.java
  108. +8 −3 modules/dcache-webdav/src/main/java/org/dcache/webdav/transfer/RemoteTransferHandler.java
  109. +1 −1 modules/dcache-xrootd/pom.xml
  110. +3 −1 modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/NettyXrootdServer.java
  111. +11 −4 modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdRedirectHandler.java
  112. +70 −0 modules/dcache/README.md
  113. +1 −5 modules/dcache/pom.xml
  114. +2 −1 modules/dcache/src/main/java/diskCacheV111/doors/CopyManager.java
  115. +16 −16 modules/dcache/src/main/java/diskCacheV111/poolManager/HttpPoolMgrEngineV3.java
  116. +1 −1 modules/dcache/src/main/java/diskCacheV111/poolManager/PoolSelectionUnitV2.java
  117. +14 −1 modules/dcache/src/main/java/diskCacheV111/poolManager/RequestContainerV5.java
  118. +1 −1 modules/dcache/src/main/java/diskCacheV111/util/HTMLWriter.java
  119. +1 −1 modules/dcache/src/main/java/org/dcache/http/HttpPoolRequestHandler.java
  120. +22 −2 modules/dcache/src/main/java/org/dcache/pool/classic/MoverRequestScheduler.java
  121. +29 −17 modules/dcache/src/main/java/org/dcache/pool/migration/Job.java
  122. +9 −1 modules/dcache/src/main/java/org/dcache/pool/migration/JobDefinition.java
  123. +12 −1 modules/dcache/src/main/java/org/dcache/pool/migration/MigrationModule.java
  124. +14 −0 modules/dcache/src/main/java/org/dcache/pool/migration/Task.java
  125. +1 −0 modules/dcache/src/main/java/org/dcache/pool/migration/TaskCompletionHandler.java
  126. +7 −1 modules/dcache/src/main/java/org/dcache/pool/migration/TaskParameters.java
  127. +1 −1 modules/dcache/src/main/java/org/dcache/pool/movers/RemoteHttpDataTransferProtocol.java
  128. +11 −1 modules/dcache/src/main/java/org/dcache/pool/repository/json/RepositoryData.java
  129. +46 −6 modules/dcache/src/main/java/org/dcache/pool/repository/v5/ReplicaRepository.java
  130. +4 −4 modules/dcache/src/main/java/org/dcache/poolmanager/WRandomPartition.java
  131. +0 −110 modules/dcache/src/main/java/org/dcache/util/SpringLiquibase.java
  132. +80 −2 modules/dcache/src/main/java/org/dcache/util/Transfer.java
  133. +1 −1 modules/dcache/src/main/resources/org/dcache/alarms/db/sql/alarms.changelog-2.6.1.xml
  134. +1 −1 modules/dcache/src/main/resources/org/dcache/alarms/db/sql/alarms.changelog-master.xml
  135. +1 −1 modules/dcache/src/main/resources/org/dcache/pinmanager/model/db.changelog-2.16.xml
  136. +1 −1 modules/dcache/src/main/resources/org/dcache/pinmanager/model/db.changelog-master.xml
  137. +8 −1 modules/dcache/src/main/resources/org/dcache/services/billing/cells/billing.xml
  138. +24 −0 modules/dcache/src/main/resources/org/dcache/services/billing/db/sql/00-billing.changelog-pre.xml
  139. +1 −1 modules/dcache/src/main/resources/org/dcache/services/billing/db/sql/billing.changelog-1.9.13.xml
  140. +1 −1 modules/dcache/src/main/resources/org/dcache/services/billing/db/sql/billing.changelog-2.15.xml
  141. +1 −1 modules/dcache/src/main/resources/org/dcache/services/billing/db/sql/billing.changelog-2.16.xml
  142. +1 −1 modules/dcache/src/main/resources/org/dcache/services/billing/db/sql/billing.changelog-2.2.8.xml
  143. +1 −1 modules/dcache/src/main/resources/org/dcache/services/billing/db/sql/billing.changelog-2.4.xml
  144. +1 −1 modules/dcache/src/main/resources/org/dcache/services/billing/db/sql/billing.changelog-2.6.xml
  145. +1 −1 modules/dcache/src/main/resources/org/dcache/services/billing/db/sql/billing.changelog-3.2.xml
  146. +1 −1 modules/dcache/src/main/resources/org/dcache/services/billing/db/sql/billing.changelog-5.2.xml
  147. +1 −1 modules/dcache/src/main/resources/org/dcache/services/billing/db/sql/billing.changelog-master.xml
  148. +1 −1 modules/dcache/src/main/resources/org/dcache/services/pinmanager1/changelog/db.changelog-master.xml
  149. +32 −1 modules/dcache/src/main/smc/org/dcache/pool/migration/Task.sm
  150. +410 −0 modules/dcache/src/main/smc/org/dcache/pool/migration/Task_sm.dot
  151. BIN modules/dcache/src/main/smc/org/dcache/pool/migration/Task_sm.dot.png
  152. +72 −0 modules/dcache/src/test/java/diskCacheV111/poolManager/RequestContainerV5Test.java
  153. +1 −1 modules/ftp-client/pom.xml
  154. +1 −1 modules/gplazma2-alise/pom.xml
  155. +1 −1 modules/gplazma2-banfile/pom.xml
  156. +2 −2 modules/gplazma2-fermi/pom.xml
  157. +1 −1 modules/gplazma2-grid/pom.xml
  158. +1 −1 modules/gplazma2-htpasswd/pom.xml
  159. +1 −1 modules/gplazma2-jaas/pom.xml
  160. +1 −1 modules/gplazma2-kpwd/pom.xml
  161. +1 −1 modules/gplazma2-krb5/pom.xml
  162. +1 −1 modules/gplazma2-ldap/pom.xml
  163. +1 −1 modules/gplazma2-multimap/pom.xml
  164. +1 −1 modules/gplazma2-nis/pom.xml
  165. +1 −1 modules/gplazma2-nsswitch/pom.xml
  166. +1 −1 modules/gplazma2-oidc-te/pom.xml
  167. +1 −1 modules/gplazma2-oidc/pom.xml
  168. +1 −1 modules/gplazma2-omnisession/pom.xml
  169. +1 −1 modules/gplazma2-pyscript/pom.xml
  170. +1 −1 modules/gplazma2-roles/pom.xml
  171. +1 −1 modules/gplazma2-scitoken/pom.xml
  172. +1 −1 modules/gplazma2-voms/pom.xml
  173. +1 −1 modules/gplazma2/pom.xml
  174. +1 −1 modules/logback-console-config/pom.xml
  175. +1 −1 modules/logback-test-config/pom.xml
  176. +1 −1 modules/missingfiles-semsg/pom.xml
  177. +1 −1 modules/srm-client/pom.xml
  178. +1 −1 modules/srm-common/pom.xml
  179. +1 −1 modules/srm-server/pom.xml
  180. +2 −2 modules/srm-server/src/main/resources/org/dcache/srm/request/sql/srm.changelog-2.14.xml
  181. +1 −1 modules/srm-server/src/main/resources/org/dcache/srm/request/sql/srm.changelog-4.0.xml
  182. +6 −1 modules/srm-server/src/main/resources/org/dcache/srm/request/sql/srm.changelog-master.xml
  183. +1 −1 packages/fhs/pom.xml
  184. +2 −2 packages/pom.xml
  185. +1 −1 packages/system-test/pom.xml
  186. +1 −1 packages/tar/pom.xml
  187. +1 −1 packages/tar/src/main/container/Dockerfile
  188. +9 −1 packages/tar/src/main/container/run.sh
  189. +1 −1 plugins/hsqldb/pom.xml
  190. +1 −1 plugins/hsqldb/src/main/resources/org/dcache/hsqldb/changelog/billing-1.9.13.xml
  191. +1 −1 plugins/hsqldb/src/main/resources/org/dcache/hsqldb/changelog/billing-2.16.xml
  192. +2 −2 plugins/hsqldb/src/main/resources/org/dcache/hsqldb/changelog/billing-2.2.xml
  193. +1 −1 plugins/hsqldb/src/main/resources/org/dcache/hsqldb/changelog/billing-master.xml
  194. +1 −1 plugins/pom.xml
  195. +9 −18 pom.xml
  196. +3 −0 skel/share/defaults/billing.properties
  197. +1 −0 skel/share/defaults/chimera.properties
  198. +0 −1 skel/share/defaults/dcache.properties
  199. +1 −0 skel/share/defaults/nfs.properties
  200. +1 −0 skel/share/defaults/pnfsmanager.properties
  201. +131 −0 skel/share/httpd/static/images/dCache-logo.svg
  202. BIN skel/share/httpd/static/images/eagleredtrans.gif
  203. +24 −44 skel/share/httpd/static/index.html
  204. +4 −8 skel/share/httpd/static/styles/billing.css
  205. +156 −15 skel/share/httpd/static/styles/common.css
  206. +5 −69 skel/share/httpd/static/styles/poolinfo.css
  207. +6 −10 skel/share/httpd/static/styles/queueInfo.css
  208. +0 −6 skel/share/httpd/static/styles/restoreHandler.css
  209. +0 −51 skel/share/httpd/static/styles/usageInfo.css
  210. +1 −1 skel/share/lib/billing.sh
  211. +10 −3 skel/share/lib/database.sh
150 changes: 150 additions & 0 deletions .ci/generate-releases-xml.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
#!/bin/sh


SRM_RPM_NAME=`ls /home/marina/dcache/modules/srm-client/target/rpmbuild/RPMS/noarch/ | grep dcache-srmclient`
SRM_RPM_SUM=`md5sum /home/marina/dcache/modules/srm-client/target/rpmbuild/RPMS/noarch/$SRM_RPM_NAME | cut -d ' ' -f 1`
DEB_NAME=`ls /home/marina/dcache/packages/fhs/target/ | grep dcache`
DEB_SUM=`md5sum /home/marina/dcache/packages/fhs/target/$DEB_NAME | cut -d ' ' -f 1`
TAR_NAME=`ls /home/marina/dcache/packages/tar/target/ | grep dcache`
TAR_SUM=`md5sum /home/marina/dcache/packages/tar/target/$TAR_NAME | cut -d ' ' -f 1`
RPM_NAME=`ls /home/marina/dcache/packages/fhs/target/rpmbuild/RPMS/noarch/ | grep dcache`
RPM_SUM=`md5sum /home/marina/dcache/packages/fhs/target/rpmbuild/RPMS/noarch/$RPM_NAME | cut -d ' ' -f 1`
DATE=`date +"%Y.%m.%d"`

echo "| Download | Build date | md5 sum |"
echo "|:-----------|:-----------|----------|"
echo "| $RPM_NAME | $DATE | $RPM_SUM |"
echo "| $DEB_NAME | $DATE | $DEB_SUM |"
echo "| $TAR_NAME | $DATE | $TAR_SUM |"
echo "| $SRM_RPM_NAME | $DATE | $SRM_RPM_SUM |"

echo ; echo; echo
git log `git describe --tags --abbrev=0`...`git describe --tags --abbrev=0 HEAD^` --no-merges --format='[%h](https://github.com/dcache/dcache/commit/%H)%n: %s%n'



my_string="10.0.13"
before_last_dot=$(echo "$my_string" | rev | cut -d'.' -f2- | rev)
echo "$before_last_dot"



series=$(echo "$my_string" | rev | cut -d'.' -f2- | rev)
echo "TES series $series"


get_series() { # $1 dCache version
echo ${my_string%%.*([0-9])}
}

get_bugfix() { # $1 dCache version
echo ${my_string##*([0-9]).*([0-9]).}
}

echo "TEST 1 ${my_string##*([0-9]).*([0-9]).}"

echo "Test 2 ${my_string%%.*([0-9])}"

file="releases-$(echo $series).html"
echo "test html file name $file"

update_releases() { # $1 - dCache version
# old web pages
#[ -z ${date+x} ] || date_param="--stringparam date $date"
# xsltproc --stringparam version $1 $date_param --stringparam checksums-path "$(pwd)" $share/update-releases.xsl releases.xml > out.xml
# mv out.xml releases.xml

# new web pages
[ -z ${date} ] && date=$(date +%d.%m.%Y)
series=$(get_series $my_string)
bugfix=$(get_bugfix $my_string)
file="releases-$(echo $series).html"

echo "test file name $file"


# replace rec (= recent version, green highlighted) with even or odd
# if newest version is odd, the last version was even and vice versa
even_odd="odd"
mod=$((13 % 2))
[ $mod -eq "0" ] || even_odd="even"

tmp_file="$file.tmp"
touch $tmp_file
sed "s/rec/${even_odd}/" $file > $tmp_file

mv $tmp_file $file

echo "TEST $tmp_file"

echo $file

echo

# write new table entry on top
cat > releases.xml << EOF
<div class="test">
<style>
table.releases tbody tr.rec { background-color: #9f9; }
table.releases tbody tr.odd { background-color: #e8f6f8; }
table.releases tbody tr.even { background-color: #d0e5e8; }
</style>
<table border="1">
<thead>
<tr>
<th>Download</th>
<th>Rel. Date</th>
<th>md5 hash</th>
<th>Release Notes</th>
</tr>
</thead>
<!-- First Row -->
<tr class="rec" id="$my_string">
<td class="link">
<a href="/old/downloads/1.9/repo/$series/$DEB_NAME">
dCache $my_string (Debian package)
</a>
</td>
<td class="date">$DATE</td>
<td class="hash">$DEB_SUM</td>
<td class="notes" rowspan="3">
<a href="/old/downloads/1.9/release-notes-$series.shtml#release$my_string">
$my_string
</a>
</td>
</tr>
<!-- Second Row -->
<tr class="rec">
<td class="link">
<a href="/old/downloads/1.9/repo/$series/$RPM_NAME">
dCache $my_string (rpm)
</a>
</td>
<td class="date">$DATE</td>
<td class="hash">$RPM_SUM</td>
</tr>
<!-- Third Row -->
<tr class="rec">
<td class="link">
<a href="/old/downloads/1.9/repo/$series/$TAR_NAME">
dCache $my_string (tgz)
</a>
</td>
<td class="date">$DATE</td>
<td class="hash">$TAR_SUM</td>
</tr>
</table>
</div>
EOF

# Add old table entries below the new one
cat $file >> $tmp_file
mv $tmp_file $file
}

update_releases

33 changes: 17 additions & 16 deletions .github/workflows/mirror.yml
Original file line number Diff line number Diff line change
@@ -9,19 +9,20 @@ jobs:
to_gitlab:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Mirror + trigger CI
uses: SvanBoxel/gitlab-mirror-and-ci-action@0.6
with:
args: "https://gitlab.desy.de/dcache/dcache"
env:
FOLLOW_TAGS: "true"
FORCE_PUSH: "false"
GITLAB_HOSTNAME: "gitlab.desy.de"
GITLAB_USERNAME: "dcache"
GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }}
GITLAB_PROJECT_ID: "21"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
POLL_TIMEOUT: 60
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Mirror + trigger CI
uses: SvanBoxel/gitlab-mirror-and-ci-action@0.6
with:
args: "https://gitlab.desy.de/dcache/dcache"
env:
FOLLOW_TAGS: "true"
FORCE_PUSH: "false"
GITLAB_HOSTNAME: "gitlab.desy.de"
GITLAB_USERNAME: "dcache"
GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }}
GITLAB_PROJECT_ID: "21"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
POLL_TIMEOUT: 60
30 changes: 27 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -386,18 +386,42 @@ AI Generated Release Notes:
- curl -L -o chatgpt https://github.com/kardolus/chatgpt-cli/releases/latest/download/chatgpt-linux-amd64 && chmod +x chatgpt
- LAST_TAG=$(.ci/get-git-version.sh $CI_COMMIT_TAG)
- |-
git log $LAST_TAG..$CI_COMMIT_TAG | \
git log --grep=maven-release-plugin --invert-grep $LAST_TAG..$CI_COMMIT_TAG | \
OPENAI_API_KEY=$LLM_API_KEY \
OPENAI_URL=$LLM_API_ENDPOINT \
OPENAI_MODEL=$LLM_MODEL \
OPENAI_COMPLETIONS_PATH=$LLM_COMPLETIONS_PATH \
OPENAI_ROLE="You are a helpful tech writer working on release notes of the dCache project." \
OPENAI_ROLE="You are a helpful tech writer working on release notes of the dCache project, ignoring commits with messages starting with '[maven-release-plugin]'." \
./chatgpt "$LLM_PROMPT" | \
tee -a release-$CI_COMMIT_TAG.md
artifacts:
paths:
- release-*.md


#
# Prepare releases download table in html format
#
Release Notes Table:
image: almalinux:9-minimal
stage: upload
extends: .upload_rules
allow_failure: true
dependencies:
- sign_deb
- sign_rpm
- sign_srm_client_rpm
- tar
script:
- microdnf install -y git-core
- git fetch --refetch --all --tags
- .ci/generate-releases-xml.sh >> release-$CI_COMMIT_TAG.xml

#tee -a release-$CI_COMMIT_TAG.md
artifacts:
paths:
- release1-*.md

#
# prepare kubernetes env for the build
#
@@ -648,4 +672,4 @@ Run OIDC test:
- kubectl -n $K8S_NAMESPACE run oidc-tester --image=almalinux:9 --restart=Never --command -- sleep 3600
- while ! kubectl -n $K8S_NAMESPACE wait --for=condition=Ready pod oidc-tester; do sleep 1; done
- kubectl -n $K8S_NAMESPACE cp .ci/run-oidc-test.sh oidc-tester:/run-oidc-test.sh
- kubectl -n $K8S_NAMESPACE exec oidc-tester -- /bin/sh /run-oidc-test.sh
- kubectl -n $K8S_NAMESPACE exec oidc-tester -- /bin/sh /run-oidc-test.sh
2 changes: 1 addition & 1 deletion archetypes/dcache-nearline-plugin-archetype/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.dcache</groupId>
<artifactId>archetypes</artifactId>
<version>10.2.0-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</parent>

<artifactId>dcache-nearline-plugin-archetype</artifactId>
2 changes: 1 addition & 1 deletion archetypes/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>org.dcache</groupId>
<artifactId>dcache-parent</artifactId>
<version>10.2.0-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</parent>

<artifactId>archetypes</artifactId>
2 changes: 1 addition & 1 deletion docs/TheBook/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>org.dcache</groupId>
<artifactId>documentation</artifactId>
<version>10.2.0-SNAPSHOT</version>
<version>11.0.0-SNAPSHOT</version>
</parent>

<artifactId>TheBook</artifactId>
Loading