Merge commit 'a9dc5d683761e08ad04513a979601dd933165c27'

.github/workflows/server-buildpackage-rust.child.yaml

@@ -76,6 +76,7 @@ jobs:
           JOB_GIT_NAME: "${{ inputs.jobGitName }}"
           JOB_DISTRO: "${{ matrix.jobDistro }}"
           JOB_RELEASE: "${{ inputs.jobRelease }}"
+          APT_PROXY_URL: "${{ vars.APT_PROXY_URL }}"
           DISABLE_APT_PROXY: "true"
         working-directory: "${{ inputs.directory }}"
         run: "ci_job_package_gst_rust_debian.sh"

.github/workflows/server-buildpackage.child.yaml

@@ -92,6 +92,7 @@ jobs:
           JOB_GIT_NAME: "${{ inputs.jobGitName }}"
           JOB_GIT_NAME_FALLBACK: "${{ inputs.jobGitNameFallback }}"
           JOB_RELEASE: "${{ inputs.jobRelease }}"
+          APT_PROXY_URL: "${{ vars.APT_PROXY_URL }}"
           DISABLE_APT_PROXY: "true"
           INSTALL_PATH: "${{ steps.copy-artifacts.outputs.download-path }}"
         working-directory: "${{ inputs.directory }}"

.github/workflows/server-deploy-debian.child.yaml

@@ -81,5 +81,6 @@ jobs:
           JOB_RELEASE: "${{ inputs.jobRelease }}"
           JOB_DEPLOY_NAME: "${{ inputs.jobDeployName }}"
           APTLY_GPG_SUBKEY: "${{ vars.APTLY_GPG_SUBKEY }}"
+          APTLY_SERVER: "${{ vars.APTLY_SERVER }}"
         working-directory: "artifacts/"
         run: "ci_job_deploy_debian.sh"

ci-scripts/ci_job_deploy_debian.sh

@@ -13,6 +13,10 @@
 #/
 #/ * Variable(s) from Jenkins global configuration:
 #/
+#/ APTLY_SERVER
+#/ 
+#/   IP address of the ssh server that hosts the aptly service. A DNS name is not allowed just an IPv4
+#/
 #/ APTLY_GPG_SUBKEY
 #/
 #/   The GnuPG key used to sign Debian package repositories with Aptly.
@@ -128,6 +132,7 @@ docker run --pull always --rm -i \
     --mount type=bind,src="$KURENTO_SCRIPTS_HOME",dst=/ci-scripts \
     --mount type=bind,src="$APTLY_SSH_KEY_PATH",dst=/id_aptly_ssh \
     --mount type=bind,src="$PWD",dst=/workdir \
+    --add-host aptly=$APTLY_SERVER \
     --workdir /workdir \
     buildpack-deps:20.04-scm /bin/bash <<DOCKERCOMMANDS
 
@@ -141,25 +146,25 @@ set -o xtrace
 # Exit trap, used to clean up.
 on_exit() {
     ssh -n -o StrictHostKeyChecking=no -i /id_aptly_ssh \
-        aptly@aptly.naevatec.com -p 3322 '\
+        aptly@aptly -p 3322 '\
             rm -rf "$TEMP_DIR"'
 }
 trap on_exit EXIT
 
 ssh -n -o StrictHostKeyChecking=no -i /id_aptly_ssh \
-    aptly@aptly.naevatec.com -p 3322 '\
+    aptly@aptly -p 3322 '\
         mkdir -p "$TEMP_DIR"'
 
 scp -o StrictHostKeyChecking=no -i /id_aptly_ssh \
     -P 3322 ./*.*deb \
-    aptly@aptly.naevatec.com:"$TEMP_DIR"
+    aptly@aptly:"$TEMP_DIR"
 
 scp -o StrictHostKeyChecking=no -i /id_aptly_ssh \
     -P 3322 /ci-scripts/ci_aptly_repo_publish.sh \
-    aptly@aptly.naevatec.com:"$TEMP_DIR"
+    aptly@aptly:"$TEMP_DIR"
 
 ssh -n -o StrictHostKeyChecking=no -i /id_aptly_ssh \
-    aptly@aptly.naevatec.com -p 3322 '\
+    aptly@aptly -p 3322 '\
         cd "$TEMP_DIR" \
         && GPGKEY="$APTLY_GPG_SUBKEY" \
            ./ci_aptly_repo_publish.sh $PUBLISH_ARGS'

ci-scripts/ci_job_package_debian.sh

@@ -19,6 +19,11 @@
 #/   Added for GitHub Actions: No proxy is needed.
 #/   Optional.
 #/
+#/ APT_PROXY_URL
+#/
+#/   Sets the URL that points to the Apt proxy to be used (if not diabled)
+#/   Madatory if DISABLE_APT_PROXY is set to false
+#/
 #/ INSTALL_PATH
 #/
 #/   Path where to find the packages that should be installed.
@@ -96,7 +101,7 @@ if [[ "$JOB_RELEASE" == "true" ]]; then
 fi
 
 if [[ "${DISABLE_APT_PROXY:-}" != "true" ]]; then
-    KURENTO_BUILDPACKAGE_ARGS+=(--apt-proxy http://apt-proxy.naevatec.com:3142)
+    KURENTO_BUILDPACKAGE_ARGS+=(--apt-proxy "$APT_PROXY_URL")
 fi
 
 

ci-scripts/ci_job_package_gst_rust_debian.sh

@@ -19,6 +19,11 @@
 #/   Added for GitHub Actions: No proxy is needed.
 #/   Optional.
 #/
+#/ APT_PROXY_URL
+#/
+#/   Sets the URL that points to the Apt proxy to be used (if not diabled)
+#/   Madatory if DISABLE_APT_PROXY is set to false
+#/
 #/ INSTALL_PATH
 #/
 #/   Path where to find the packages that should be installed.
@@ -104,7 +109,7 @@ if [[ "$JOB_RELEASE" == "true" ]]; then
 fi
 
 if [[ "${DISABLE_APT_PROXY:-}" != "true" ]]; then
-    KURENTO_BUILDPACKAGE_ARGS+=(--apt-proxy http://apt-proxy.naevatec.com:3142)
+    KURENTO_BUILDPACKAGE_ARGS+=(--apt-proxy "$APT_PROXY_URL")
 fi
 if [[ -n "$GST_RUST_PACKAGE" ]]; then
     KURENTO_BUILDPACKAGE_ARGS+=(--package "$GST_RUST_PACKAGE")