diff --git a/.github/actions/deb-delivery/action.yml b/.github/actions/deb-delivery/action.yml index 6451cae234..d7f04da931 100644 --- a/.github/actions/deb-delivery/action.yml +++ b/.github/actions/deb-delivery/action.yml @@ -59,8 +59,9 @@ runs: exit 1 fi - # Handle either standard debian or ubuntu repository path - if [[ "${{ inputs.distrib }}" == "jammy" ]]; then + if [[ "${{ inputs.is_cloud }}" == "true" ]]; then + ROOT_REPO_PATH="apt-standard-internal-${{ inputs.stability }}" + elif [[ "${{ inputs.distrib }}" == "jammy" ]]; then ROOT_REPO_PATH="ubuntu-standard-${{ inputs.version }}-${{ inputs.stability }}" else ROOT_REPO_PATH="apt-standard-${{ inputs.version }}-${{ inputs.stability }}" diff --git a/.github/actions/delivery/action.yml b/.github/actions/delivery/action.yml index 20084cfbe3..b22763f29d 100644 --- a/.github/actions/delivery/action.yml +++ b/.github/actions/delivery/action.yml @@ -160,7 +160,9 @@ runs: echo "[DEBUG] - Major version: $VERSION" - if [[ "${{ inputs.distrib }}" == "jammy" ]]; then + if [[ "${{ inputs.is_cloud }}" == "true" ]]; then + ROOT_REPO_PATH="apt-standard-internal-${{ inputs.stability }}" + elif [[ "${{ inputs.distrib }}" == "jammy" ]]; then ROOT_REPO_PATH="ubuntu-standard-${{ inputs.major_version }}-${{ inputs.stability }}" else ROOT_REPO_PATH="apt-standard-${{ inputs.major_version }}-${{ inputs.stability }}" diff --git a/.github/docker/Dockerfile.gorgone-testing-bookworm b/.github/docker/Dockerfile.gorgone-testing-bookworm index c418b21a44..14a99caa8c 100644 --- a/.github/docker/Dockerfile.gorgone-testing-bookworm +++ b/.github/docker/Dockerfile.gorgone-testing-bookworm @@ -1,10 +1,13 @@ FROM debian:bookworm ARG VERSION +ARG IS_CLOUD ENV DEBIAN_FRONTEND=noninteractive -RUN bash -e <