Skip to content
Snippets Groups Projects
Commit b9d8f250 authored by Martin Christoph Hierholzer's avatar Martin Christoph Hierholzer
Browse files

use pigz instead of gzip to compress artefacts

parent 011dc884
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,7 @@ RUN apt-get update && \ ...@@ -10,7 +10,7 @@ RUN apt-get update && \
apt-get update && \ apt-get update && \
apt-get upgrade -y && \ apt-get upgrade -y && \
apt-get dist-upgrade -y && \ apt-get dist-upgrade -y && \
apt-get install -y sudo wget python3-pip locales \ apt-get install -y sudo wget python3-pip locales pigz \
g++ valgrind cppcheck lcov doxygen procmail make git gdb cmake ninja-build \ g++ valgrind cppcheck lcov doxygen procmail make git gdb cmake ninja-build \
libboost-all-dev libxml++2.6-dev \ libboost-all-dev libxml++2.6-dev \
libldap2-dev libzmq3-dev rpcbind \ libldap2-dev libzmq3-dev rpcbind \
......
...@@ -5,7 +5,7 @@ ENV https_proxy http://xfelproxy.desy.de:3128 ...@@ -5,7 +5,7 @@ ENV https_proxy http://xfelproxy.desy.de:3128
RUN zypper refresh && \ RUN zypper refresh && \
zypper up -y && \ zypper up -y && \
zypper dup -y --force-resolution --allow-vendor-change && \ zypper dup -y --force-resolution --allow-vendor-change && \
zypper install -y lsb-release wget sudo tar gzip && \ zypper install -y lsb-release wget sudo tar gzip pigz && \
zypper install -y gcc-c++ cmake valgrind cppcheck lcov doxygen procmail make gdb meson ninja && \ zypper install -y gcc-c++ cmake valgrind cppcheck lcov doxygen procmail make gdb meson ninja && \
zypper install -y libxml++26-devel && \ zypper install -y libxml++26-devel && \
zypper install -y python3-devel python3-numpy-devel && \ zypper install -y python3-devel python3-numpy-devel && \
......
...@@ -144,7 +144,7 @@ def transformIntoStep(String libraryName, ArrayList<String> dependencyList, Stri ...@@ -144,7 +144,7 @@ def transformIntoStep(String libraryName, ArrayList<String> dependencyList, Stri
touch mv /scratch/artefact.list touch mv /scratch/artefact.list
mv /scratch/artefact.list /scratch/dependencies.${JOBNAME_CLEANED}.list mv /scratch/artefact.list /scratch/dependencies.${JOBNAME_CLEANED}.list
echo /scratch/dependencies.${JOBNAME_CLEANED}.list >> export.list.installed echo /scratch/dependencies.${JOBNAME_CLEANED}.list >> export.list.installed
sudo -H -u msk_jenkins tar zcf install-${JOBNAME_CLEANED}-${label}-${buildType}.tgz --files-from export.list.installed sudo -H -u msk_jenkins tar cf install-${JOBNAME_CLEANED}-${label}-${buildType}.tgz --files-from export.list.installed --use-compress-program="pigz -9 -p32"
""" """
archiveArtifacts artifacts: "install-${JOBNAME_CLEANED}-${label}-${buildType}.tgz", onlyIfSuccessful: false archiveArtifacts artifacts: "install-${JOBNAME_CLEANED}-${label}-${buildType}.tgz", onlyIfSuccessful: false
} }
......
...@@ -179,7 +179,7 @@ def doDependencyArtefacts(ArrayList<String> dependencyList, String label, String ...@@ -179,7 +179,7 @@ def doDependencyArtefacts(ArrayList<String> dependencyList, String label, String
// unpack artefact // unpack artefact
sh """ sh """
tar zxf \"artefacts/install-${dependency_cleaned}-${label}-${buildType}.tgz\" -C / --keep-directory-symlink tar xf \"artefacts/install-${dependency_cleaned}-${label}-${buildType}.tgz\" -C / --keep-directory-symlink --use-compress-program="pigz -9 -p32"
""" """
// keep track of dependencies to download - used when dependees need to resolve our dependencies // keep track of dependencies to download - used when dependees need to resolve our dependencies
...@@ -218,7 +218,7 @@ def doBuilddirArtefact(String label, String buildType) { ...@@ -218,7 +218,7 @@ def doBuilddirArtefact(String label, String buildType) {
// Then obtain artefacts of dependencies (from /scratch/artefact.list) // Then obtain artefacts of dependencies (from /scratch/artefact.list)
sh """ sh """
for a in artefacts/build-*-${label}-${buildType}.tgz ; do for a in artefacts/build-*-${label}-${buildType}.tgz ; do
sudo -H -E -u msk_jenkins tar zxf \"\${a}\" -C / sudo -H -E -u msk_jenkins tar xf \"\${a}\" -C / --use-compress-program="pigz -9 -p32"
done done
touch /scratch/artefact.list touch /scratch/artefact.list
...@@ -236,7 +236,7 @@ def doBuilddirArtefact(String label, String buildType) { ...@@ -236,7 +236,7 @@ def doBuilddirArtefact(String label, String buildType) {
sh """ sh """
if ls artefacts/install-*-${label}-${buildType}.tgz 1>/dev/null 2>&1; then if ls artefacts/install-*-${label}-${buildType}.tgz 1>/dev/null 2>&1; then
for a in artefacts/install-*-${label}-${buildType}.tgz ; do for a in artefacts/install-*-${label}-${buildType}.tgz ; do
tar zxf \"\${a}\" -C / tar xf \"\${a}\" -C / --use-compress-program="pigz -9 -p32"
done done
fi fi
""" """
...@@ -287,7 +287,7 @@ EOF ...@@ -287,7 +287,7 @@ EOF
script { script {
// generate and archive artefact from build directory (used for the analysis job) // generate and archive artefact from build directory (used for the analysis job)
sh """ sh """
sudo -H -E -u msk_jenkins tar zcf build-${JOBNAME_CLEANED}-${label}-${buildType}.tgz /scratch sudo -H -E -u msk_jenkins tar cf build-${JOBNAME_CLEANED}-${label}-${buildType}.tgz /scratch --use-compress-program="pigz -9 -p32"
""" """
archiveArtifacts artifacts: "build-${JOBNAME_CLEANED}-${label}-${buildType}.tgz", onlyIfSuccessful: false archiveArtifacts artifacts: "build-${JOBNAME_CLEANED}-${label}-${buildType}.tgz", onlyIfSuccessful: false
} }
...@@ -470,7 +470,7 @@ def doInstall(String label, String buildType) { ...@@ -470,7 +470,7 @@ def doInstall(String label, String buildType) {
if [ -e /scratch/artefact.list ]; then if [ -e /scratch/artefact.list ]; then
cp /scratch/artefact.list scratch/dependencies.${JOBNAME_CLEANED}.list cp /scratch/artefact.list scratch/dependencies.${JOBNAME_CLEANED}.list
fi fi
sudo -H -E -u msk_jenkins tar zcf ${WORKSPACE}/install-${JOBNAME_CLEANED}-${label}-${buildType}.tgz . sudo -H -E -u msk_jenkins tar cf ${WORKSPACE}/install-${JOBNAME_CLEANED}-${label}-${buildType}.tgz . --use-compress-program="pigz -9 -p32"
""" """
// Archive the artefact tar ball (even if other branches of this build failed - TODO: do we really want to do that?) // Archive the artefact tar ball (even if other branches of this build failed - TODO: do we really want to do that?)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment