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.0.9
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 389 changed files with 16,665 additions and 3,950 deletions.
5 changes: 0 additions & 5 deletions .ci/cvmfs-storageclass.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions .ci/cvmfs-volume-storageclass-pvc.yaml

This file was deleted.

10 changes: 10 additions & 0 deletions .ci/frontend.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: v1
kind: Pod
metadata:
name: http-tester
spec:
containers:
- name: tester
image: jetbrains/intellij-http-client
imagePullPolicy: IfNotPresent
command: [ "/bin/sleep", "inf"]
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

48 changes: 48 additions & 0 deletions .ci/get-git-version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#!/bin/bash

# Function to decrement a version string
decrement_version() {
local version=$1
local major minor patch

# Extract major, minor, and patch components
IFS='.' read -r major minor patch <<< "$version"

if [[ $patch -gt 0 ]]; then
# Decrement patch version
patch=$((patch - 1))
elif [[ $minor -gt 0 ]]; then
# Decrement minor version and reset patch to max value (assumed to be 9 for simplicity)
minor=$((minor - 1))
patch=0
elif [[ $major -gt 0 ]]; then
# Decrement major version, reset minor and patch to max value
major=$((major - 1))
minor=`git tag -l "$major.*" | sort -V -r | head -1 | cut -d '.' -f 2`
patch=0
else
# If all components are zero, cannot decrement further
echo "Version cannot be decremented further."
exit 1
fi

echo "$major.$minor.$patch"
}

# Main script
if [[ $# -ne 1 ]]; then
echo "Usage: $0 <version>"
exit 1
fi

version=$1

# Validate version format
if [[ ! $version =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
echo "Invalid version format. Expected format: major.minor.patch (e.g., 0.25.0)"
exit 1
fi

previous_version=$(decrement_version "$version")
echo "$previous_version"

38 changes: 38 additions & 0 deletions .ci/init-el9-ui.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#!/bin/sh

#
# Required to support grid tools that sill use SHA1
#
update-crypto-policies --set DEFAULT:SHA1

AUTOCA_URL=https://ci.dcache.org/ca

dnf -q install -y epel-release which
dnf -q install -y https://download.dcache.org/nexus/repository/s2-testsuite/el9/x86_64/s2-20240423-1.x86_64.rpm
dnf -q install -y voms-clients-cpp fetch-crl openssl globus-gass-copy-progs

rpm -i https://www.desy.de/~tigran/ca_dCacheORG-3.0-6.noarch.rpm
rpm -i https://linuxsoft.cern.ch/wlcg/centos7/x86_64/desy-voms-all-1.0.0-1.noarch.rpm

curl https://repository.egi.eu/sw/production/cas/1/current/repo-files/egi-trustanchors.repo -o /etc/yum.repos.d/egi-trustanchors.repo

dnf -y install ca_USERTrustRSACertificationAuthority \
ca_ResearchandEducationTrustRSARootCA \
ca_GEANTeScienceSSLCA4 \
ca_USERTrustECCCertificationAuthority \
ca_GEANTeScienceSSLECCCA4 \
ca_GEANTTCSAuthenticationRSACA4B

curl --silent https://raw.githubusercontent.com/kofemann/autoca/v1.0-py3/pyclient/autoca-client -o autoca-client && chmod a+x autoca-client
python3 ./autoca-client -n -k userkey.pem -c usercert.pem ${AUTOCA_URL} "Kermit the frog"


/usr/sbin/fetch-crl

voms-proxy-init -cert=usercert.pem -key=userkey.pem -voms=desy
voms-proxy-info -all

# standard location for the proxy
export X509_USER_PROXY=/tmp/x509up_u$(id -u)


40 changes: 0 additions & 40 deletions .ci/init-grid-ui.sh

This file was deleted.

Loading