diff --git a/linux/jdk/alpine/src/main/packaging/entrypoint.sh b/linux/jdk/alpine/src/main/packaging/entrypoint.sh index 52aa28e7a..e55585801 100644 --- a/linux/jdk/alpine/src/main/packaging/entrypoint.sh +++ b/linux/jdk/alpine/src/main/packaging/entrypoint.sh @@ -9,9 +9,11 @@ cp -R /home/builder/build/generated/packaging /home/builder/workspace # Install Adoptium Public Key sudo chmod 664 /etc/apk/repositories sudo chgrp abuild /etc/apk/repositories +sudo chmod 775 /etc/apk/keys sudo wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk sudo echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories sudo wget -O /home/builder/.abuild/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk +ls -ltr /etc/apk/keys # Set permssions sudo chown -R builder /home/builder/out diff --git a/linux/jre/alpine/src/main/packaging/entrypoint.sh b/linux/jre/alpine/src/main/packaging/entrypoint.sh index 52aa28e7a..d6d3e739d 100644 --- a/linux/jre/alpine/src/main/packaging/entrypoint.sh +++ b/linux/jre/alpine/src/main/packaging/entrypoint.sh @@ -9,6 +9,8 @@ cp -R /home/builder/build/generated/packaging /home/builder/workspace # Install Adoptium Public Key sudo chmod 664 /etc/apk/repositories sudo chgrp abuild /etc/apk/repositories +sudo chmod 664 /etc/apk/keys +sudo chmod 775 /etc/apk/keys sudo wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk sudo echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories sudo wget -O /home/builder/.abuild/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk diff --git a/linux_new/Jenkinsfile b/linux_new/Jenkinsfile index 17316582f..7fb20cac7 100644 --- a/linux_new/Jenkinsfile +++ b/linux_new/Jenkinsfile @@ -185,7 +185,7 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String RelVer } else { echo "Target Doesnt Exist - Upload Files" // This Upload Works - jf 'rt u ${FILENAME} deb/pool/main/t/temurin-${RELNUM}/ --target-props=${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH} --flat=true' + // jf 'rt u ${FILENAME} deb/pool/main/t/temurin-${RELNUM}/ --target-props=${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH} --flat=true' break } case "Alpine": @@ -197,7 +197,7 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String RelVer break } else { // This Upload Works - jf 'rt u **/build/ospackage/${FILENAME} apk/alpine/main/${BUILDARCH}/ --flat=true' + // jf 'rt u **/build/ospackage/${FILENAME} apk/alpine/main/${BUILDARCH}/ --flat=true' break } case "RPMS": @@ -208,7 +208,7 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String RelVer echo "Target Exists - Skipping" break } else { - jf 'rt u ${FILENAME} ${PACKAGEDIR}/ --flat=true' + // jf 'rt u ${FILENAME} ${PACKAGEDIR}/ --flat=true' break } default: @@ -907,10 +907,10 @@ post { echo "Release : ${params.TAG}" echo "FileName : ${ArchiveFileName}" - build job: 'publish_linux_pkg_src', parameters: [ - string(name: 'TAG', value: "${params.TAG}"), - string(name: 'FILENAME', value: "${ArchiveFileName}") - ] + //build job: 'publish_linux_pkg_src', parameters: [ + // string(name: 'TAG', value: "${params.TAG}"), + // string(name: 'FILENAME', value: "${ArchiveFileName}") + //] } else { echo 'Dry Run is enabled. Skipping downstream job trigger.' } diff --git a/linux_new/jdk/alpine/src/main/packaging/entrypoint.sh b/linux_new/jdk/alpine/src/main/packaging/entrypoint.sh index 52aa28e7a..38c4708ee 100644 --- a/linux_new/jdk/alpine/src/main/packaging/entrypoint.sh +++ b/linux_new/jdk/alpine/src/main/packaging/entrypoint.sh @@ -8,6 +8,7 @@ cp -R /home/builder/build/generated/packaging /home/builder/workspace # Install Adoptium Public Key sudo chmod 664 /etc/apk/repositories +sudo chmod 775 /etc/apk/keys sudo chgrp abuild /etc/apk/repositories sudo wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk sudo echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories diff --git a/linux_new/jre/alpine/src/main/packaging/entrypoint.sh b/linux_new/jre/alpine/src/main/packaging/entrypoint.sh index 52aa28e7a..38c4708ee 100644 --- a/linux_new/jre/alpine/src/main/packaging/entrypoint.sh +++ b/linux_new/jre/alpine/src/main/packaging/entrypoint.sh @@ -8,6 +8,7 @@ cp -R /home/builder/build/generated/packaging /home/builder/workspace # Install Adoptium Public Key sudo chmod 664 /etc/apk/repositories +sudo chmod 775 /etc/apk/keys sudo chgrp abuild /etc/apk/repositories sudo wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk sudo echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories