Enable AFS mirrors for ubuntu-bionic testing

We now have AFS mirrors in place for ubuntu-bionic, allow the nodepool
dsvm job to use them.

Change-Id: If79639154613e2a6a08fe3a269c17335f5b6451f
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-03-30 20:30:04 -04:00
parent 3088534dc1
commit ddc27435b0
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
1 changed files with 3 additions and 5 deletions

View File

@ -101,6 +101,7 @@ EOF
cat > /tmp/50-apt-allow-unauthenticated <<EOF
if [ -d "\$TARGET_ROOT/etc/apt/apt.conf.d" ]; then
echo "APT::Get::AllowUnauthenticated \"true\";" | sudo tee \$TARGET_ROOT/etc/apt/apt.conf.d/95allow-unauthenticated
echo "Acquire::AllowInsecureRepositories \"true\";" | sudo tee -a \$TARGET_ROOT/etc/apt/apt.conf.d/95allow-unauthenticated
fi
EOF
sudo mv /tmp/01-nodepool-setup \
@ -482,11 +483,8 @@ diskimages:
DIB_DISABLE_APT_CLEANUP: '1'
DIB_DEV_USER_AUTHORIZED_KEYS: $NODEPOOL_PUBKEY
DIB_DEBIAN_COMPONENTS: 'main,universe'
# NOTE(pabelanger): Due to an issue with reprepro and empty repo, we
# cannot use AFS mirrors until bionic-updates / bionic-backports actually
# have packages.
#$DIB_DISTRIBUTION_MIRROR_UBUNTU
#$DIB_DEBOOTSTRAP_EXTRA_ARGS
$DIB_DISTRIBUTION_MIRROR_UBUNTU
$DIB_DEBOOTSTRAP_EXTRA_ARGS
$DIB_GET_PIP
$DIB_GLEAN_INSTALLTYPE
$DIB_GLEAN_REPOLOCATION