From 9716e29b57cfb23c760af85128ebfb34a1b45971 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Wed, 30 Oct 2024 10:47:16 +0000 Subject: [PATCH] Oct 2024 release linux changelogs Signed-off-by: Andrew Leonard --- linux/Jenkinsfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/linux/Jenkinsfile b/linux/Jenkinsfile index 7d49d9caf..6f57015b8 100644 --- a/linux/Jenkinsfile +++ b/linux/Jenkinsfile @@ -177,18 +177,18 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String Versio case "Debian": // Not RISC Use JF CLI if (BuildArch != "riscv64") { - sh "$JF_HOME/jf" rt u "**/build/ospackage/temurin-*${BUILDARCH}.deb" "deb/pool/main/t/temurin-${VERSION}/" --target-props="${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH}" --flat=true + sh "$JF_HOME/jf rt u **/build/ospackage/temurin-*${BUILDARCH}.deb deb/pool/main/t/temurin-${VERSION}/ --target-props=${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH} --flat=true" } if (BuildArch == "riscv64") { handleRISCVUpload("Debian", "${BUILDARCH}", "${VERSION}", "${DISTROLIST}", "", "", "") } break case "Alpine": - sh "$JF_HOME/jf" rt u "**/build/ospackage/${FILENAME}" "apk/alpine/main/${BUILDARCH}/" --flat=true + sh "$JF_HOME/jf rt u **/build/ospackage/${FILENAME} apk/alpine/main/${BUILDARCH}/ --flat=true" break case "RPMS": if (BuildArch != "riscv64") { - sh "$JF_HOME/jf" rt u "**/build/ospackage/*.${VALUE}.rpm" "${PACKAGEDIR}/${KEY}/Packages/" --flat=true + sh "$JF_HOME/jf rt u **/build/ospackage/*.${VALUE}.rpm ${PACKAGEDIR}/${KEY}/Packages/ --flat=true" } if (BuildArch == "riscv64") { handleRISCVUpload("RPMS","" ,"", "", "${VALUE}", "${PACKAGEDIR}", "${KEY}" ) @@ -197,7 +197,7 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String Versio default: echo "Default Case" if (BuildArch != "riscv64") { - sh "$JF_HOME/jf" rt u "**/build/ospackage/*.${VALUE}.rpm" "${PACKAGEDIR}/${KEY}/Packages/" --flat=true + sh "$JF_HOME/jf rt u **/build/ospackage/*.${VALUE}.rpm ${PACKAGEDIR}/${KEY}/Packages/ --flat=true" } if (BuildArch == "riscv64") { handleRISCVUpload("RPMS","" ,"", "", "${VALUE}", "${PACKAGEDIR}", "${KEY}" ) @@ -228,15 +228,15 @@ def handleRISCVUpload(String Distro, String BuildArch, String Version, String Di switch(Distro) { case "Debian": echo "Debian Upload" - sh "$JF_HOME/jf" rt u "**/build/ospackage/temurin-*${BUILDARCH}.deb" "deb/pool/main/t/temurin-${VERSION}/" --target-props="${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH}" --flat=true + sh "$JF_HOME/jf rt u **/build/ospackage/temurin-*${BUILDARCH}.deb deb/pool/main/t/temurin-${VERSION}/ --target-props=${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH} --flat=true" break case "RPMS": echo "RPM Upload" - sh "$JF_HOME/jf" rt u "**/build/ospackage/*.${VALUE}.rpm" "${PACKAGEDIR}/${KEY}/Packages/" --flat=true + sh "$JF_HOME/jf rt u **/build/ospackage/*.${VALUE}.rpm ${PACKAGEDIR}/${KEY}/Packages/ --flat=true" break default: echo "Default Upload" - sh "$JF_HOME/jf" rt u "**/build/ospackage/*.${VALUE}.rpm" "${PACKAGEDIR}/${KEY}/Packages/" --flat=true + sh "$JF_HOME/jf rt u **/build/ospackage/*.${VALUE}.rpm ${PACKAGEDIR}/${KEY}/Packages/ --flat=true" break } // Remove copied artifacts