Update divingbell to use Ubuntu 18.04
Updated divingbell to use Ubuntu 18.04. Change-Id: I721ffddbe8d8939303a1d38266462e751feca2f0
This commit is contained in:
parent
634421a2e9
commit
f9de95a6cc
2
Vagrantfile
vendored
2
Vagrantfile
vendored
@ -2,7 +2,7 @@
|
|||||||
# vi: set ft=ruby :
|
# vi: set ft=ruby :
|
||||||
|
|
||||||
Vagrant.configure("2") do |config|
|
Vagrant.configure("2") do |config|
|
||||||
config.vm.box = "generic/ubuntu1604"
|
config.vm.box = "generic/ubuntu1804"
|
||||||
|
|
||||||
[:virtualbox, :parallels, :libvirt, :hyperv].each do |provider|
|
[:virtualbox, :parallels, :libvirt, :hyperv].each do |provider|
|
||||||
config.vm.provider provider do |vplh, override|
|
config.vm.provider provider do |vplh, override|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
# name: value
|
# name: value
|
||||||
|
|
||||||
images:
|
images:
|
||||||
divingbell: 'ubuntu:16.04'
|
divingbell: 'ubuntu:18.04'
|
||||||
pull_policy: IfNotPresent
|
pull_policy: IfNotPresent
|
||||||
|
|
||||||
conf:
|
conf:
|
||||||
|
@ -97,7 +97,7 @@ build_all_packages_yaml(){
|
|||||||
set -x
|
set -x
|
||||||
}
|
}
|
||||||
APT_REPOSITORY1="http://us.archive.ubuntu.com/ubuntu/"
|
APT_REPOSITORY1="http://us.archive.ubuntu.com/ubuntu/"
|
||||||
APT_DISTRIBUTIONS1="[ xenial ]"
|
APT_DISTRIBUTIONS1="[ bionic ]"
|
||||||
APT_COMPONENTS1="[ main, universe, restricted, multiverse ]"
|
APT_COMPONENTS1="[ main, universe, restricted, multiverse ]"
|
||||||
APT_SUBREPOS1="[ backports, updates ]"
|
APT_SUBREPOS1="[ backports, updates ]"
|
||||||
APT_GPGKEYID1="437D 05B5"
|
APT_GPGKEYID1="437D 05B5"
|
||||||
@ -179,7 +179,7 @@ Twx6DKLF+3rF5nf1F3Q=
|
|||||||
=PBAe
|
=PBAe
|
||||||
-----END PGP PUBLIC KEY BLOCK-----"
|
-----END PGP PUBLIC KEY BLOCK-----"
|
||||||
APT_REPOSITORY2="http://security.ubuntu.com/ubuntu/"
|
APT_REPOSITORY2="http://security.ubuntu.com/ubuntu/"
|
||||||
APT_DISTRIBUTIONS2="[ xenial ]"
|
APT_DISTRIBUTIONS2="[ bionic ]"
|
||||||
APT_COMPONENTS2="[ main, universe, restricted, multiverse ]"
|
APT_COMPONENTS2="[ main, universe, restricted, multiverse ]"
|
||||||
APT_SUBREPOS2="[ security ]"
|
APT_SUBREPOS2="[ security ]"
|
||||||
APT_GPGKEYID2="C0B2 1F32"
|
APT_GPGKEYID2="C0B2 1F32"
|
||||||
@ -248,7 +248,7 @@ DjfegedFClqpn37b
|
|||||||
=rDTH
|
=rDTH
|
||||||
-----END PGP PUBLIC KEY BLOCK-----"
|
-----END PGP PUBLIC KEY BLOCK-----"
|
||||||
APT_REPOSITORY3="https://download.ceph.com/debian-mimic/"
|
APT_REPOSITORY3="https://download.ceph.com/debian-mimic/"
|
||||||
APT_DISTRIBUTIONS3="[ xenial ]"
|
APT_DISTRIBUTIONS3="[ bionic ]"
|
||||||
APT_COMPONENTS3="[ main ]"
|
APT_COMPONENTS3="[ main ]"
|
||||||
APT_GPGKEYID3="460F 3994"
|
APT_GPGKEYID3="460F 3994"
|
||||||
APT_GPGKEY3="-----BEGIN PGP PUBLIC KEY BLOCK-----
|
APT_GPGKEY3="-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
@ -280,7 +280,7 @@ vkdivtdqrq2DXY+ftuqLOQ7b+t1RctbcMHGPptlxFuN9ufP5TiTWSpfqDwmHCLsT
|
|||||||
k2vFiMwcHdLpQ1IH8ORVRgPPsiBnBOJ/kIiXG2SxPUTjjEGOVgeA
|
k2vFiMwcHdLpQ1IH8ORVRgPPsiBnBOJ/kIiXG2SxPUTjjEGOVgeA
|
||||||
=/Tod
|
=/Tod
|
||||||
-----END PGP PUBLIC KEY BLOCK-----"
|
-----END PGP PUBLIC KEY BLOCK-----"
|
||||||
#deb https://download.ceph.com/debian-mimic/ xenial main
|
#deb https://download.ceph.com/debian-mimic/ bionic main
|
||||||
EXEC_DIR=/var/${NAME}/exec
|
EXEC_DIR=/var/${NAME}/exec
|
||||||
# this used in test_overrides to check amount of daemonsets defined
|
# this used in test_overrides to check amount of daemonsets defined
|
||||||
EXPECTED_NUMBER_OF_DAEMONSETS=17
|
EXPECTED_NUMBER_OF_DAEMONSETS=17
|
||||||
|
Loading…
Reference in New Issue
Block a user