From 5026171b5f0fc7a7362a27b889deb39d47526741 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 24 Jun 2020 12:16:32 +0200 Subject: [PATCH] Cleaning up .gitlab-ci.yml --- .gitlab-ci.yml | 52 ++------------------------------------------------ 1 file changed, 2 insertions(+), 50 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3ca86f..fa0ebf1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,8 +19,6 @@ variables: VSPHERE_CLUSTER: '' VSPHERE_VM_FOLDER: 'templates' MAX_NR_TEMPLATES_STAY: 4 - # TEMPLATE_VM_NAME: 'template.pixelpark.com' - # TEMPLATE_NAME: 'oracle-linux-7-template' VMWARE_CONFIG_VERSION: 'vmx-15' VM_OS_VERSION: 'oracleLinux7_64Guest' VM_DISK_SIZE_GB: 32 @@ -205,54 +203,8 @@ Create Centos8 template: - /^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 # vim: et list -- 2.39.5