Minor changes to .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0165a367d6d09fbe33773599969dd12fdc8da03..b46559e7cb1d31c278dac3cf583251aaefc79473 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,9 +27,10 @@ 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_GENERAL: 60
   MAX_WAIT_SHUTDOWN: 120
   MAX_WAIT_FOR_FINISH_INSTALL: 3600
+  GITLAB_USER_EMAIL: frank.brehm@pixelpark.com
 
 .template_job: &job_definition
   before_script:
@@ -81,7 +82,7 @@ Deploy OEL7 template image:
     - hostname -f
     - whoami
     - pwd
-    - echo; echo "Environment:"; env; echo
+    - echo; echo "Environment:"; env | sort -i -f; echo
     - rm -fv etc/create.ini
     - 'echo "[vSphere]" > etc/create.ini'
     - 'echo "host = ${VSPHERE_HOST}" >> etc/create.ini'
@@ -110,7 +111,7 @@ Deploy OEL7 template image:
     - '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'
-    #- 'echo "Generated etc/create.ini:"; cat etc/create.ini; echo "<-- EOF"'
+    - 'echo "Generated etc/create.ini:"; cat etc/create.ini; echo "<-- EOF"'
     - bin/create-vmware-template --verbose --color yes --config etc/create.ini
   environment:
     name: production