diff --git a/.github/workflows/server-buildpackage-rust.child.yaml b/.github/workflows/server-buildpackage-rust.child.yaml index 0f36ed745..e66df9e15 100644 --- a/.github/workflows/server-buildpackage-rust.child.yaml +++ b/.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" diff --git a/.github/workflows/server-buildpackage.child.yaml b/.github/workflows/server-buildpackage.child.yaml index f35e459dd..95e2b1bb6 100644 --- a/.github/workflows/server-buildpackage.child.yaml +++ b/.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 }}" diff --git a/.github/workflows/server-deploy-debian.child.yaml b/.github/workflows/server-deploy-debian.child.yaml index 494f48d8f..ca36a4828 100644 --- a/.github/workflows/server-deploy-debian.child.yaml +++ b/.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" diff --git a/ci-scripts/ci_job_deploy_debian.sh b/ci-scripts/ci_job_deploy_debian.sh index f81101b60..559034985 100755 --- a/ci-scripts/ci_job_deploy_debian.sh +++ b/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 <