Skip to content

Commit

Permalink
git submodule update --remote
Browse files Browse the repository at this point in the history
  • Loading branch information
hswong3i committed May 2, 2021
1 parent fbcdf92 commit 288a74b
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
.script-bootstrap-vagrant: &script-bootstrap-vagrant
- |
if ! [[ -x "$(command -v vagrant)" ]]; then
curl -skL -O https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_x86_64.deb
sudo dpkg -i vagrant_2.2.15_x86_64.deb
rm -rf vagrant_2.2.15_*
curl -skL -O https://releases.hashicorp.com/vagrant/2.2.16/vagrant_2.2.16_x86_64.deb
sudo dpkg -i vagrant_2.2.16_x86_64.deb
rm -rf vagrant_2.2.16_*
fi
sh -x -c "vagrant --version"
vagrant cloud auth login --token $VAGRANT_CLOUD_TOKEN
Expand Down
2 changes: 1 addition & 1 deletion roles/locales
2 changes: 1 addition & 1 deletion roles/python
2 changes: 1 addition & 1 deletion roles/sshd
2 changes: 1 addition & 1 deletion roles/timezone
18 changes: 9 additions & 9 deletions scripts/bootstrap-vagrant.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,27 @@ cd "$(cd "$(dirname "$0")"; pwd -P)/../"
if [ -x "$(command -v apt-get)" ]; then
apt-get update
apt-get install -y binutils bridge-utils dnsmasq-base ebtables gcc libguestfs-tools libvirt-clients libvirt-daemon-system libvirt-dev make qemu-system qemu-utils ruby-dev
curl -skL -O https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_x86_64.deb
dpkg -i vagrant_2.2.15_x86_64.deb
rm -rf vagrant_2.2.15_*
curl -skL -O https://releases.hashicorp.com/vagrant/2.2.16/vagrant_2.2.16_x86_64.deb
dpkg -i vagrant_2.2.16_x86_64.deb
rm -rf vagrant_2.2.16_*
fi

# Prepare YUM dependencies
if [ -x "$(command -v yum)" ]; then
yum makecache
yum install -y binutils dnsmasq ebtables gcc libguestfs-tools-c libvirt libvirt-client libvirt-devel make qemu-img qemu-kvm ruby-devel virt-install
curl -skL -O https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_x86_64.rpm
yum localinstall vagrant_2.2.15_x86_64.rpm
rm -rf vagrant_2.2.15_*
curl -skL -O https://releases.hashicorp.com/vagrant/2.2.16/vagrant_2.2.16_x86_64.rpm
yum localinstall vagrant_2.2.16_x86_64.rpm
rm -rf vagrant_2.2.16_*
fi

# Prepare Zypper dependencies
if [ -x "$(command -v zypper)" ]; then
zypper -n --gpg-auto-import-keys refresh
zypper -n install -y binutils-gold bridge-utils dnsmasq ebtables gcc guestfs-tools libvirt libvirt-client libvirt-devel make qemu-kvm qemu-tools ruby-devel virt-install
curl -skL -O https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_x86_64.rpm
zypper install vagrant_2.2.15_x86_64.rpm
rm -rf vagrant_2.2.15_*
curl -skL -O https://releases.hashicorp.com/vagrant/2.2.16/vagrant_2.2.16_x86_64.rpm
zypper install vagrant_2.2.16_x86_64.rpm
rm -rf vagrant_2.2.16_*
fi

# Install vagrant-libvirt
Expand Down

0 comments on commit 288a74b

Please sign in to comment.