Applying new timeout settings for create job in .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d72d8f3ce240e4d32f5b70402ee8206ddcbf1db..c0165a367d6d09fbe33773599969dd12fdc8da03 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,12 +27,13 @@ variables:
   VM_RAM_MB: 4096
   VM_NETWORK: '192.168.88.0_23'
   VM_MAC_ADDRESS: '00:16:3e:54:ab:2b'
+  MAX_WAIT_GENERAL: 3
+  MAX_WAIT_SHUTDOWN: 120
   MAX_WAIT_FOR_FINISH_INSTALL: 3600
 
 .template_job: &job_definition
   before_script:
-    - rm -rf venv
-    - virtualenv --python=python3.6 venv
+    - if [ ! -d venv ] ; then virtualenv --python=python3.6 venv; else true; fi
     - source venv/bin/activate
     - pip install --upgrade pip
     - pip install --upgrade --upgrade-strategy eager --requirement python_fb_tools/requirements.txt
@@ -80,6 +81,7 @@ Deploy OEL7 template image:
     - hostname -f
     - whoami
     - pwd
+    - echo; echo "Environment:"; env; echo
     - rm -fv etc/create.ini
     - 'echo "[vSphere]" > etc/create.ini'
     - 'echo "host = ${VSPHERE_HOST}" >> etc/create.ini'
@@ -101,6 +103,10 @@ Deploy OEL7 template image:
     - 'echo "ram_mb = ${VM_RAM_MB}" >> etc/create.ini'
     - 'echo "network = ${VM_NETWORK}" >> etc/create.ini'
     - 'echo "mac_address = ${VM_MAC_ADDRESS}" >> etc/create.ini'
+    - 'echo "" >> etc/create.ini'
+    - 'echo "[Timeouts]" >> etc/create.ini'
+    - 'echo "max_wait_for_general = ${MAX_WAIT_GENERAL}" >> etc/create.ini'
+    - 'echo "max_wait_for_shutdown_vm = ${MAX_WAIT_SHUTDOWN}" >> etc/create.ini'
     - 'echo "max_wait_for_finish_install = ${MAX_WAIT_FOR_FINISH_INSTALL}" >> etc/create.ini'
     - 'echo "" >> etc/create.ini'
     - 'echo "; vim: filetype=dosini" >> etc/create.ini'