Skip to content

Commit

Permalink
debug
Browse files Browse the repository at this point in the history
  • Loading branch information
dpmatthews committed Mar 27, 2024
1 parent 210ffa0 commit 0d6c8b0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ jobs:
run: |
export VAGRANT_VAGRANTFILE=Vagrantfile.${{ matrix.os }}
vagrant up
vagrant status
vagrant ssh -c "grep 'errors occurred during installation' /var/log/install.log || true" || \
( echo Retry && sleep 20 && vagrant ssh -c "grep 'errors occurred during installation' /var/log/install.log || true" )
vagrant ssh -c "grep -q 'No errors detected' /var/log/install.log && \
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile.ubuntu-1804-headless
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "bento/ubuntu-18.04"
# Remove "desktop" from the args below if only accessing via SSH
# Remove "mosrs" from the args below if not accessing the Met Office Science Repository Service
config.vm.provision :shell, path: "install.sh", args: "ubuntu 1804 desktop mosrs"
config.vm.provision :shell, path: "install.sh", args: "ubuntu 1804 desktop mosrs skip-shutdown"
config.ssh.forward_x11 = true

config.vm.provider "virtualbox" do |v|
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile.ubuntu-2204-headless
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "bento/ubuntu-22.04"
# Remove "desktop" from the args below if only accessing via SSH
# Remove "mosrs" from the args below if not accessing the Met Office Science Repository Service
config.vm.provision :shell, path: "install.sh", args: "ubuntu 2204 desktop mosrs"
config.vm.provision :shell, path: "install.sh", args: "ubuntu 2204 desktop mosrs skip-shutdown"
config.ssh.forward_x11 = true

config.vm.provider "virtualbox" do |v|
Expand Down
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ else
echo "[INFO] No errors detected"
fi

if [[ $collections =~ desktop && false ]]; then
if [[ $collections =~ desktop && ! $collections =~ skip-shutdown ]]; then
echo Shutting down the system.
echo Please run vagrant up to restart it.
rm /etc/nologin
Expand Down

0 comments on commit 0d6c8b0

Please sign in to comment.