Deactivating job Deploy OEL7 template image

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7fd9fac0c20484134ed3f8435913f9b152f63c05..cbfdffd18931d5baebde9195dd83710f9e43ff69 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,10 +39,8 @@ variables:
     - 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
     - pip install --upgrade --upgrade-strategy eager --requirement requirements.txt
-    - cd python_fb_tools && ./compile-xlate-msgs.sh; cd ..
-    - if [ -x compile-xlate-msgs.sh ] ; then ./compile-xlate-msgs.sh; fi
+    - if [ -x bin/compile-xlate-msgs.sh ] ; then bin/compile-xlate-msgs.sh; fi
   tags:
     - deploy
   after_script:
@@ -79,52 +77,52 @@ Linter:
     - /^hf.*$/
     - tags
 
-Deploy OEL7 template image:
-  <<: *job_definition
-  stage: deploy
-  script:
-    - hostname -f
-    - whoami
-    - pwd
-    # - echo; echo "Environment:"; env | sort -i -f; echo
-    - rm -fv etc/create.ini
-    - 'echo; echo "########################"; echo "Estelle Vorlage ${TEMPLATE_NAME}"; echo "########################"; echo "Temporäre VM: ${TEMPLATE_VM_NAME} (in ${VSPHERE_VM_FOLDER})"; echo'
-    - 'echo "[vSphere]" > etc/create.ini'
-    - 'echo "host = ${VSPHERE_HOST}" >> etc/create.ini'
-    - 'echo "port = ${VSPHERE_API_PORT}" >> etc/create.ini'
-    - 'echo "user = ${VSPHERE_API_USER}" >> etc/create.ini'
-    - 'echo "password = ${VSPHERE_API_PASSWD_PROD}" >> etc/create.ini'
-    - 'echo "dc = ${VSPHERE_DC}" >> etc/create.ini'
-    - 'echo "cluster = ${VSPHERE_CLUSTER}" >> etc/create.ini'
-    - 'echo "folder = ${VSPHERE_VM_FOLDER}" >> etc/create.ini'
-    - 'echo "max_nr_templates_stay = ${MAX_NR_TEMPLATES_STAY}" >> etc/create.ini'
-    - 'echo "" >> etc/create.ini'
-    - 'echo "[Template]" >> etc/create.ini'
-    - 'echo "vm = ${TEMPLATE_VM_NAME}" >> etc/create.ini'
-    - 'echo "name = ${TEMPLATE_NAME}" >> etc/create.ini'
-    - 'echo "vmware_cfg_version = ${VMWARE_CONFIG_VERSION}" >> etc/create.ini'
-    - 'echo "os_version = ${VM_OS_VERSION}" >> etc/create.ini'
-    - 'echo "data_size_gb = ${VM_DISK_SIZE_GB}" >> etc/create.ini'
-    - 'echo "num_cpus = ${VM_NUM_CPUS}" >> etc/create.ini'
-    - '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'
-    # - '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
-  except:
-    - /^dev-.*$/
-    - /^dev\/.*$/
-    - /^hf.*$/
-    - tags
-  only:
-    - schedules
+#Deploy OEL7 template image:
+#  <<: *job_definition
+#  stage: deploy
+#  script:
+#    - hostname -f
+#    - whoami
+#    - pwd
+#    # - echo; echo "Environment:"; env | sort -i -f; echo
+#    - rm -fv etc/create.ini
+#    - 'echo; echo "########################"; echo "Estelle Vorlage ${TEMPLATE_NAME}"; echo "########################"; echo "Temporäre VM: ${TEMPLATE_VM_NAME} (in ${VSPHERE_VM_FOLDER})"; echo'
+#    - 'echo "[vSphere]" > etc/create.ini'
+#    - 'echo "host = ${VSPHERE_HOST}" >> etc/create.ini'
+#    - 'echo "port = ${VSPHERE_API_PORT}" >> etc/create.ini'
+#    - 'echo "user = ${VSPHERE_API_USER}" >> etc/create.ini'
+#    - 'echo "password = ${VSPHERE_API_PASSWD_PROD}" >> etc/create.ini'
+#    - 'echo "dc = ${VSPHERE_DC}" >> etc/create.ini'
+#    - 'echo "cluster = ${VSPHERE_CLUSTER}" >> etc/create.ini'
+#    - 'echo "folder = ${VSPHERE_VM_FOLDER}" >> etc/create.ini'
+#    - 'echo "max_nr_templates_stay = ${MAX_NR_TEMPLATES_STAY}" >> etc/create.ini'
+#    - 'echo "" >> etc/create.ini'
+#    - 'echo "[Template]" >> etc/create.ini'
+#    - 'echo "vm = ${TEMPLATE_VM_NAME}" >> etc/create.ini'
+#    - 'echo "name = ${TEMPLATE_NAME}" >> etc/create.ini'
+#    - 'echo "vmware_cfg_version = ${VMWARE_CONFIG_VERSION}" >> etc/create.ini'
+#    - 'echo "os_version = ${VM_OS_VERSION}" >> etc/create.ini'
+#    - 'echo "data_size_gb = ${VM_DISK_SIZE_GB}" >> etc/create.ini'
+#    - 'echo "num_cpus = ${VM_NUM_CPUS}" >> etc/create.ini'
+#    - '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'
+#    # - '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
+#  except:
+#    - /^dev-.*$/
+#    - /^dev\/.*$/
+#    - /^hf.*$/
+#    - tags
+#  only:
+#    - schedules