Reorder upgrade

Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Change-Id: If6e8953d3334a71e2405f04ecd32bd28a9273c51

diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh
index 27d37d2..1c18b89 100644 (file)
--- a/packer/provision/agl_dependencies.sh
+++ b/packer/provision/agl_dependencies.sh
@@ -44,10 +44,6 @@ DEBIAN_FRONTEND=noninteractive apt-get update && \
                        xterm python3-subunit mesa-common-dev zstd liblz4-tool
 
 
-# let the upgrade run anyway
-rm -rf /var/run/reboot-requir*
-
-DEBIAN_FRONTEND=noninteractive do-release-upgrade -f DistUpgradeViewNonInteractive
 
 DEBIAN_FRONTEND=noninteractive apt-get clean
 #DEBIAN_FRONTEND=noninteractive apt-get -y install linux-image-4.15.0-123-generic
@@ -79,6 +75,12 @@ EOFHOSTS
 # install newer version of jjb ... fixes issues with rendering
 sudo pip install --upgrade --force-reinstall -v jenkins-job-builder
 
+# let the upgrade run anyway
+rm -rf /var/run/reboot-requir*
+
+DEBIAN_FRONTEND=noninteractive do-release-upgrade -f DistUpgradeViewNonInteractive --mode=server
+
+
 cat <<EOFSYSCTL >> /etc/sysctl.conf
 # we have a lot of make jobs, this helps a lot
 kernel.sched_child_runs_first = 1