Merge 61c4b501a0 into 7e2e986a6b

.github/workflows/external_trigger.yml

@@ -12,20 +12,17 @@ jobs:
       - name: External Trigger
         if: github.ref == 'refs/heads/main'
         run: |
-          printf "# External trigger for docker-unifi-network-application\n\n" >> $GITHUB_STEP_SUMMARY
           if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN }}" ]; then
-            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github secret \`PAUSE_EXTERNAL_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
-          echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-          echo "> External trigger running off of main branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN\`" >> $GITHUB_STEP_SUMMARY
-          printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
+          echo "**** External trigger running off of main branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN\". ****"
+          echo "External trigger running off of main branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN\`" >> $GITHUB_STEP_SUMMARY
+          echo "**** Retrieving external version ****"
           EXT_RELEASE=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}')
-          echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
-            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
+            echo "**** Can't retrieve external version, exiting ****"
             FAILURE_REASON="Can't retrieve external version for unifi-network-application branch main"
             GHA_TRIGGER_URL="https://github.com/linuxserver/docker-unifi-network-application/actions/runs/${{ github.run_id }}"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
@@ -34,8 +31,9 @@ jobs:
             exit 1
           fi
           EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
-          echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
-          echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
+          echo "**** External version: ${EXT_RELEASE} ****"
+          echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
+          echo "**** Retrieving last pushed version ****"
           image="linuxserver/unifi-network-application"
           tag="latest"
           token=$(curl -sX GET \
@@ -62,34 +60,37 @@ jobs:
           IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
           IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
           if [ -z "${IMAGE_VERSION}" ]; then
-            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
+            echo "**** Can't retrieve last pushed version, exiting ****"
             FAILURE_REASON="Can't retrieve last pushed version for unifi-network-application tag latest"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
               "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
             exit 1
           fi
-          echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY
+          echo "**** Last pushed version: ${IMAGE_VERSION} ****"
+          echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
-            echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
+            echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
+            echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
           elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-unifi-network-application/job/main/lastBuild/api/json | jq -r '.building') == "true" ]; then
-            echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
+            echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
+            echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
           else
-            printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
-            echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
+            echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
+            echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
             response=$(curl -iX POST \
               https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-unifi-network-application/job/main/buildWithParameters?PACKAGE_CHECK=false \
               --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-            echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
-            echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
+            echo "**** Jenkins job queue url: ${response%$'\r'} ****"
+            echo "**** Sleeping 10 seconds until job starts ****"
             sleep 10
             buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
             buildurl="${buildurl%$'\r'}"
-            echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
-            echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
+            echo "**** Jenkins job build url: ${buildurl} ****"
+            echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
+            echo "**** Attempting to change the Jenkins job description ****"
             curl -iX POST \
               "${buildurl}submitDescription" \
               --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \

.github/workflows/external_trigger_scheduler.yml

@@ -15,31 +15,31 @@ jobs:
 
       - name: External Trigger Scheduler
         run: |
-          printf "# External trigger scheduler for docker-unifi-network-application\n\n" >> $GITHUB_STEP_SUMMARY
-          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
-          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
+          echo "**** Branches found: ****"
+          git for-each-ref --format='%(refname:short)' refs/remotes
+          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
           do
-            if [[ "${br}" == "HEAD" ]]; then
-              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
-              continue
-            fi
-            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
+            br=$(echo "$br" | sed 's|origin/||g')
+            echo "**** Evaluating branch ${br} ****"
             ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-unifi-network-application/${br}/jenkins-vars.yml)
             ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch')
             ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type')
             if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then
-              echo "Branch appears to be live and trigger is not os; checking workflow." >> $GITHUB_STEP_SUMMARY
+              echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****"
               if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-unifi-network-application/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
-                echo "Triggering external trigger workflow for branch." >> $GITHUB_STEP_SUMMARY
+                echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
+                echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
                 curl -iX POST \
                   -H "Authorization: token ${{ secrets.CR_PAT }}" \
                   -H "Accept: application/vnd.github.v3+json" \
                   -d "{\"ref\":\"refs/heads/${br}\"}" \
                   https://api.github.com/repos/linuxserver/docker-unifi-network-application/actions/workflows/external_trigger.yml/dispatches
               else
-                echo "Skipping branch due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
+                echo "**** Workflow doesn't exist; skipping trigger. ****"
+                echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
               fi
             else
-              echo "Skipping branch due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
+              echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****"
+              echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
             fi
           done

.github/workflows/package_trigger.yml

@@ -12,29 +12,29 @@ jobs:
       - name: Package Trigger
         if: github.ref == 'refs/heads/main'
         run: |
-          printf "# Package trigger for docker-unifi-network-application\n\n" >> $GITHUB_STEP_SUMMARY
           if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN }}" ]; then
-            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github secret \`PAUSE_PACKAGE_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
           if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-unifi-network-application/job/main/lastBuild/api/json | jq -r '.building') == "true" ]; then
-            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
+            echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
+            echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
-          echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-          echo "> Package trigger running off of main branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN\`" >> $GITHUB_STEP_SUMMARY
+          echo "**** Package trigger running off of main branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN\". ****"
+          echo "Package trigger running off of main branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN\`" >> $GITHUB_STEP_SUMMARY
           response=$(curl -iX POST \
             https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-unifi-network-application/job/main/buildWithParameters?PACKAGE_CHECK=true \
             --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-          echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
-          echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
+          echo "**** Jenkins job queue url: ${response%$'\r'} ****"
+          echo "**** Sleeping 10 seconds until job starts ****"
           sleep 10
           buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
           buildurl="${buildurl%$'\r'}"
-          echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
-          echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
+          echo "**** Jenkins job build url: ${buildurl} ****"
+          echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
+          echo "**** Attempting to change the Jenkins job description ****"
           curl -iX POST \
             "${buildurl}submitDescription" \
             --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \

.github/workflows/package_trigger_scheduler.yml

@@ -15,19 +15,17 @@ jobs:
 
       - name: Package Trigger Scheduler
         run: |
-          printf "# Package trigger scheduler for docker-unifi-network-application\n\n" >> $GITHUB_STEP_SUMMARY
-          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
-          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
+          echo "**** Branches found: ****"
+          git for-each-ref --format='%(refname:short)' refs/remotes
+          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
           do
-            if [[ "${br}" == "HEAD" ]]; then
-              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
-              continue
-            fi
-            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
+            br=$(echo "$br" | sed 's|origin/||g')
+            echo "**** Evaluating branch ${br} ****"
             ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-unifi-network-application/${br}/jenkins-vars.yml | yq -r '.ls_branch')
             if [ "${br}" == "${ls_branch}" ]; then
-              echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
+              echo "**** Branch ${br} appears to be live; checking workflow. ****"
               if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-unifi-network-application/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
+                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
                 echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
                 triggered_branches="${triggered_branches}${br} "
                 curl -iX POST \
@@ -37,9 +35,11 @@ jobs:
                   https://api.github.com/repos/linuxserver/docker-unifi-network-application/actions/workflows/package_trigger.yml/dispatches
                 sleep 30
               else
+                echo "**** Workflow doesn't exist; skipping trigger. ****"
                 echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
               fi
             else
+              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
               echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
             fi
           done

Jenkinsfile

@@ -17,8 +17,6 @@ pipeline {
     GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
     GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
     DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
-    QUAYIO_API_TOKEN=credentials('quayio-repo-api-token')
-    GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f')
     BUILD_VERSION_ARG = 'UNIFI_VERSION'
     LS_USER = 'linuxserver'
     LS_REPO = 'docker-unifi-network-application'
@@ -38,23 +36,9 @@ pipeline {
     CI_WEBPATH=''
   }
   stages {
-    stage("Set git config"){
-      steps{
-        sh '''#!/bin/bash
-              cat ${GIT_SIGNING_KEY} > /config/.ssh/id_sign
-              chmod 600 /config/.ssh/id_sign
-              ssh-keygen -y -f /config/.ssh/id_sign > /config/.ssh/id_sign.pub
-              echo "Using $(ssh-keygen -lf /config/.ssh/id_sign) to sign commits"
-              git config --global gpg.format ssh
-              git config --global user.signingkey /config/.ssh/id_sign
-              git config --global commit.gpgsign true
-        '''
-      }
-    }
     // Setup all the basic environment variables needed for the build
     stage("Set ENV Variables base"){
       steps{
-        echo "Running on node: ${NODE_NAME}"
         sh '''#! /bin/bash
               containers=$(docker ps -aq)
               if [[ -n "${containers}" ]]; then
@@ -397,9 +381,9 @@ pipeline {
                 echo "Updating Unraid template"
                 cd ${TEMPDIR}/unraid/templates/
                 GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
-                if grep -wq "^${CONTAINER_NAME}$" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then
+                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then
                   echo "Image is on the ignore list, and already in the deprecation folder."
-                elif grep -wq "^${CONTAINER_NAME}$" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
+                elif grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
                   echo "Image is on the ignore list, marking Unraid template as deprecated"
                   cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                   git add -u unraid/${CONTAINER_NAME}.xml
@@ -492,10 +476,10 @@ pipeline {
       }
     }
     /* #######################
-       GitLab Mirroring and Quay.io Repo Visibility
+           GitLab Mirroring
        ####################### */
-    // Ping into Gitlab to mirror this repo and have a registry endpoint & mark this repo on Quay.io as public
-    stage("GitLab Mirror and Quay.io Visibility"){
+    // Ping into Gitlab to mirror this repo and have a registry endpoint
+    stage("GitLab Mirror"){
       when {
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -511,8 +495,6 @@ pipeline {
             "visibility":"public"}' '''
         sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \
           -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" '''
-        sh '''curl -H "Content-Type: application/json" -H "Authorization: Bearer ${QUAYIO_API_TOKEN}" -X POST "https://quay.io/api/v1/repository${QUAYIMAGE/quay.io/}/changevisibility" \
-          -d '{"visibility":"public"}' ||: '''
       } 
     }
     /* ###############
@@ -607,7 +589,7 @@ pipeline {
               --provenance=false --sbom=false \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
             sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-            retry_backoff(5,5) {
+            retry(5) {
               sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
             }
             sh '''#! /bin/bash
@@ -763,7 +745,7 @@ pipeline {
             passwordVariable: 'QUAYPASS'
           ]
         ]) {
-          retry_backoff(5,5) {
+          retry(5) {
             sh '''#! /bin/bash
                   set -e
                   echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
@@ -804,7 +786,7 @@ pipeline {
             passwordVariable: 'QUAYPASS'
           ]
         ]) {
-          retry_backoff(5,5) {
+          retry(5) {
             sh '''#! /bin/bash
                   set -e
                   echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
@@ -867,7 +849,7 @@ pipeline {
              "object": "'${COMMIT_SHA}'",\
              "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to main",\
              "type": "commit",\
-             "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
+             "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
         echo "Pushing New release for Tag"
         sh '''#! /bin/bash
               echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
@@ -999,13 +981,6 @@ EOF
      ###################### */
   post {
     always {
-      sh '''#!/bin/bash
-            rm -rf /config/.ssh/id_sign
-            rm -rf /config/.ssh/id_sign.pub
-            git config --global --unset gpg.format
-            git config --global --unset user.signingkey
-            git config --global --unset commit.gpgsign
-        '''
       script{
         if (env.EXIT_STATUS == "ABORTED"){
           sh 'echo "build aborted"'
@@ -1035,20 +1010,3 @@ EOF
     }
   }
 }
-
-def retry_backoff(int max_attempts, int power_base, Closure c) {
-  int n = 0
-  while (n < max_attempts) {
-    try {
-      c()
-      return
-    } catch (err) {
-      if ((n + 1) >= max_attempts) {
-        throw err
-      }
-      sleep(power_base ** n)
-      n++
-    }
-  }
-  return
-}

package_versions.txt

@@ -150,7 +150,7 @@ jstun                                     0.7.4                              jav
 jsvc                                      1.0.15-11build1                    deb                           
 jul-to-slf4j                              2.0.13                             java-archive                  
 keyboxd                                   2.4.4-2ubuntu17                    deb                           
-krb5-locales                              1.20.1-6ubuntu2.1                  deb                           
+krb5-locales                              1.20.1-6ubuntu2                    deb                           
 lazysodium-java                           5.1.4                              java-archive                  
 libacl1                                   2.3.2-1build1                      deb                           
 libapt-pkg6.0t64                          2.7.14build2                       deb                           
@@ -179,16 +179,16 @@ libgcrypt20                               1.10.3-2build1                     deb
 libgmp10                                  2:6.3.0+dfsg-2ubuntu6              deb                           
 libgnutls30t64                            3.8.3-1.1ubuntu3.1                 deb                           
 libgpg-error0                             1.47-3build2                       deb                           
-libgssapi-krb5-2                          1.20.1-6ubuntu2.1                  deb                           
+libgssapi-krb5-2                          1.20.1-6ubuntu2                    deb                           
 libhogweed6t64                            3.9.1-2.2build1                    deb                           
 libidn2-0                                 2.3.7-2build1                      deb                           
 libjpeg-turbo8                            2.1.5-2ubuntu2                     deb                           
 libjpeg8                                  8c-2ubuntu11                       deb                           
 libjq1                                    1.7.1-3build1                      deb                           
-libk5crypto3                              1.20.1-6ubuntu2.1                  deb                           
+libk5crypto3                              1.20.1-6ubuntu2                    deb                           
 libkeyutils1                              1.6.3-3build1                      deb                           
-libkrb5-3                                 1.20.1-6ubuntu2.1                  deb                           
-libkrb5support0                           1.20.1-6ubuntu2.1                  deb                           
+libkrb5-3                                 1.20.1-6ubuntu2                    deb                           
+libkrb5support0                           1.20.1-6ubuntu2                    deb                           
 libksba8                                  1.6.6-1build1                      deb                           
 liblcms2-2                                2.14-2build1                       deb                           
 libldap-common                            2.6.7+dfsg-1~exp1ubuntu8           deb