libdrm-dev is now a required package on GCE instances. launch_scripts failed saying libdrm-dev was not installed, I think it may have to do with chromium dependencies. Also, increased the wait time after creating instances because in some cases the instances were not ready to be ssh'ed into. BUG=skia:2755 R=borenet@google.com Review URL: https://codereview.chromium.org/400533004
diff --git a/compute_engine_scripts/chromecompute/vm_create_setup_instances.sh b/compute_engine_scripts/chromecompute/vm_create_setup_instances.sh index 94fbe0e..8823a08 100755 --- a/compute_engine_scripts/chromecompute/vm_create_setup_instances.sh +++ b/compute_engine_scripts/chromecompute/vm_create_setup_instances.sh
@@ -12,7 +12,7 @@ if [ "$VM_INSTANCE_OS" == "Linux" ]; then SKIA_BOT_IMAGE_NAME=$SKIA_BOT_LINUX_IMAGE_NAME REQUIRED_FILES_FOR_BOTS=${REQUIRED_FILES_FOR_LINUX_BOTS[@]} - WAIT_TIME_AFTER_CREATION_SECS=240 + WAIT_TIME_AFTER_CREATION_SECS=600 elif [ "$VM_INSTANCE_OS" == "Windows" ]; then SKIA_BOT_IMAGE_NAME=$SKIA_BOT_WIN_IMAGE_NAME ZONE=$WINDOWS_ZONE
diff --git a/compute_engine_scripts/chromecompute/vm_setup_utils.sh b/compute_engine_scripts/chromecompute/vm_setup_utils.sh index 652deb0..13ad157f 100644 --- a/compute_engine_scripts/chromecompute/vm_setup_utils.sh +++ b/compute_engine_scripts/chromecompute/vm_setup_utils.sh
@@ -14,7 +14,7 @@ "sudo apt-get -y install haveged python-django openjdk-7-jre-headless zlib1g-dev:i386 libgif-dev:i386 libpng12-dev:i386 fontconfig:i386 libgl1-mesa-dev:i386 libglu1-mesa-dev:i386 ccache g++-multilib libpoppler-cpp-dev libpoppler-cpp0:i386 && " \ "sudo cp /usr/lib/i386-linux-gnu/libpng.so /usr/lib32/ && " \ "sudo cp /usr/lib/i386-linux-gnu/libpng12.so.0 /usr/lib32/ && " \ - "sudo apt-get -y install libpng12-dev libgtk2.0-dev ant clang-3.4 openjdk-7-jdk realpath libqt4-dev-bin libqt4-core libqt4-gui libqt4-dev:i386 icewm && " \ + "sudo apt-get -y install libpng12-dev libgtk2.0-dev ant clang-3.4 openjdk-7-jdk realpath libqt4-dev-bin libqt4-core libqt4-gui libqt4-dev:i386 icewm libdrm-dev && " \ "sudo apt-get -y remove python-zope.interface && " \ "sudo easy_install zope.interface" \ || FAILED="$FAILED InstallPackages"