Improving .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b8b25dccf0e790005cee0d66c8a4d84c25dbc9b..f31d36d3b1ddc20799bcd0995be2a77ab04fef68 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -187,55 +187,56 @@ Linter:
     - which python3
     - 'echo "Environment:"; env | sed -e "s/^ROOT_PASSWORD=.*/ROOT_PASSWORD=********/" | sort -i -f; echo'
     - 'echo "Ref name: ${CI_COMMIT_REF_NAME}"; echo "System status: ${SYSTEM_STATUS}"'
-    - 'echo "Configuration file: \"${CONFIG_FILE}\""'
-    - 'cp -v /dev/null "${CONFIG_FILE}"'
-    - 'echo "[vSphere]" > "${CONFIG_FILE}"'
-    - 'echo "host = ${VSPHERE_HOST}" >> "${CONFIG_FILE}"'
-    - 'echo "port = ${VSPHERE_API_PORT}" >> "${CONFIG_FILE}"'
-    - 'echo "user = ${VSPHERE_API_USER}" >> "${CONFIG_FILE}"'
-    - 'echo "password = ${VSPHERE_API_PASSWD_PROD}" >> "${CONFIG_FILE}"'
-    - 'echo "dc = ${VSPHERE_DC}" >> "${CONFIG_FILE}"'
-    - 'echo "cluster = ${VSPHERE_CLUSTER}" >> "${CONFIG_FILE}"'
-    - 'echo "folder = ${VSPHERE_VM_FOLDER}" >> "${CONFIG_FILE}"'
-    - 'echo "storage_cluster = ${VSPHERE_STORAGE_CLUSTER}" >> "${CONFIG_FILE}"'
-    - 'echo "max_nr_templates_stay = ${MAX_NR_TEMPLATES_STAY}" >> "${CONFIG_FILE}"'
-    - 'echo "" >> "${CONFIG_FILE}"'
-    - 'echo "[Template]" >> "${CONFIG_FILE}"'
-    - 'echo "os_id = ${OS_ID}" >> "${CONFIG_FILE}"'
-    - 'echo "vmware_cfg_version = ${VMWARE_CONFIG_VERSION}" >> "${CONFIG_FILE}"'
-    - 'echo "os_version = ${VM_OS_VERSION}" >> "${CONFIG_FILE}"'
-    - 'echo "swap_space_mb = ${SWAP_SPACE_MB}" >> "${CONFIG_FILE}"'
-    - 'echo "data_size_gb = ${VM_DISK_SIZE_GB}" >> "${CONFIG_FILE}"'
-    - 'echo "num_cpus = ${VM_NUM_CPUS}" >> "${CONFIG_FILE}"'
-    - 'echo "ram_mb = ${VM_RAM_MB}" >> "${CONFIG_FILE}"'
-    - 'echo "network = ${VM_NETWORK}" >> "${CONFIG_FILE}"'
-    - 'echo "root_password = ${ROOT_PASSWORD}" >> "${CONFIG_FILE}"'
-    - 'echo "" >> "${CONFIG_FILE}"'
-    - 'echo "[Cobbler]" >> "${CONFIG_FILE}"'
-    - 'echo "host = ${COBBLER_HOST}" >> "${CONFIG_FILE}"'
-    - 'echo "ssh_user = ${COBBLER_SSH_USER}" >> "${CONFIG_FILE}"'
-    - 'echo "ssh_timeout = ${COBBLER_SSH_TIMEOUT}" >> "${CONFIG_FILE}"'
-    - 'echo "distro = ${COBBLER_DISTRO}" >> "${CONFIG_FILE}"'
-    - 'echo "root_dir = ${COBBLER_ROOT_DIR}" >> "${CONFIG_FILE}"'
-    - 'echo "templates_dir = ${COBBLER_TEMPLATES_DIR}" >> "${CONFIG_FILE}"'
-    - 'echo "snippets_dir = ${COBBLER_SNIPPETS_DIR}" >> "${CONFIG_FILE}"'
-    - 'echo "webserver_docroot = ${COBBLER_WS_DOCROOT}" >> "${CONFIG_FILE}"'
-    - 'echo "nameservers = ${COBBLER_DNS_SERVERS}" >> "${CONFIG_FILE}"'
-    - 'echo "dns_search = ${COBBLER_DNS_SEARCH}" >> "${CONFIG_FILE}"'
-    - 'echo "system_status = ${SYSTEM_STATUS}" >> "${CONFIG_FILE}"'
-    - 'echo "" >> "${CONFIG_FILE}"'
-    - 'echo "[Timeouts]" >> "${CONFIG_FILE}"'
-    - 'echo "max_wait_for_general = ${MAX_WAIT_GENERAL}" >> "${CONFIG_FILE}"'
-    - 'echo "max_wait_for_shutdown_vm = ${MAX_WAIT_SHUTDOWN}" >> "${CONFIG_FILE}"'
-    - 'echo "max_wait_for_finish_install = ${MAX_WAIT_FOR_FINISH_INSTALL}" >> "${CONFIG_FILE}"'
-    - 'echo "" >> "${CONFIG_FILE}"'
-    - 'echo "; vim: filetype=dosini" >> "${CONFIG_FILE}"'
-    - 'echo "Generated ${CONFIG_FILE}:";
-       ls -l "${CONFIG_FILE}" || true;
-       echo;
-       echo "-->";
-       cat "${CONFIG_FILE}" | sed -e "s/^\(root_password\) .*/\1 = ********/" -e "s/^\(password\) .*/\1 = ********/";
-       echo "<-- EOF"'
+    - |
+      echo "Generating configuration file: '${CONFIG_FILE}'"
+      echo "[vSphere]"                                                     > "${CONFIG_FILE}"
+      echo "host = ${VSPHERE_HOST}"                                       >> "${CONFIG_FILE}"
+      echo "port = ${VSPHERE_API_PORT}"                                   >> "${CONFIG_FILE}"
+      echo "user = ${VSPHERE_API_USER}"                                   >> "${CONFIG_FILE}"
+      echo "password = ${VSPHERE_API_PASSWD_PROD}"                        >> "${CONFIG_FILE}"
+      echo "dc = ${VSPHERE_DC}"                                           >> "${CONFIG_FILE}"
+      echo "cluster = ${VSPHERE_CLUSTER}"                                 >> "${CONFIG_FILE}"
+      echo "folder = ${VSPHERE_VM_FOLDER}"                                >> "${CONFIG_FILE}"
+      echo "storage_cluster = ${VSPHERE_STORAGE_CLUSTER}"                 >> "${CONFIG_FILE}"
+      echo "max_nr_templates_stay = ${MAX_NR_TEMPLATES_STAY}"             >> "${CONFIG_FILE}"
+      echo ""                                                             >> "${CONFIG_FILE}"
+      echo "[Template]"                                                   >> "${CONFIG_FILE}"
+      echo "os_id = ${OS_ID}"                                             >> "${CONFIG_FILE}"
+      echo "vmware_cfg_version = ${VMWARE_CONFIG_VERSION}"                >> "${CONFIG_FILE}"
+      echo "os_version = ${VM_OS_VERSION}"                                >> "${CONFIG_FILE}"
+      echo "swap_space_mb = ${SWAP_SPACE_MB}"                             >> "${CONFIG_FILE}"
+      echo "data_size_gb = ${VM_DISK_SIZE_GB}"                            >> "${CONFIG_FILE}"
+      echo "num_cpus = ${VM_NUM_CPUS}"                                    >> "${CONFIG_FILE}"
+      echo "ram_mb = ${VM_RAM_MB}"                                        >> "${CONFIG_FILE}"
+      echo "network = ${VM_NETWORK}"                                      >> "${CONFIG_FILE}"
+      echo "root_password = ${ROOT_PASSWORD}"                             >> "${CONFIG_FILE}"
+      echo ""                                                             >> "${CONFIG_FILE}"
+      echo "[Cobbler]"                                                    >> "${CONFIG_FILE}"
+      echo "host = ${COBBLER_HOST}"                                       >> "${CONFIG_FILE}"
+      echo "ssh_user = ${COBBLER_SSH_USER}"                               >> "${CONFIG_FILE}"
+      echo "ssh_timeout = ${COBBLER_SSH_TIMEOUT}"                         >> "${CONFIG_FILE}"
+      echo "distro = ${COBBLER_DISTRO}"                                   >> "${CONFIG_FILE}"
+      echo "root_dir = ${COBBLER_ROOT_DIR}"                               >> "${CONFIG_FILE}"
+      echo "templates_dir = ${COBBLER_TEMPLATES_DIR}"                     >> "${CONFIG_FILE}"
+      echo "snippets_dir = ${COBBLER_SNIPPETS_DIR}"                       >> "${CONFIG_FILE}"
+      echo "webserver_docroot = ${COBBLER_WS_DOCROOT}"                    >> "${CONFIG_FILE}"
+      echo "nameservers = ${COBBLER_DNS_SERVERS}"                         >> "${CONFIG_FILE}"
+      echo "dns_search = ${COBBLER_DNS_SEARCH}"                           >> "${CONFIG_FILE}"
+      echo "system_status = ${SYSTEM_STATUS}"                             >> "${CONFIG_FILE}"
+      echo ""                                                             >> "${CONFIG_FILE}"
+      echo "[Timeouts]"                                                   >> "${CONFIG_FILE}"
+      echo "max_wait_for_general = ${MAX_WAIT_GENERAL}"                   >> "${CONFIG_FILE}"
+      echo "max_wait_for_shutdown_vm = ${MAX_WAIT_SHUTDOWN}"              >> "${CONFIG_FILE}"
+      echo "max_wait_for_finish_install = ${MAX_WAIT_FOR_FINISH_INSTALL}" >> "${CONFIG_FILE}"
+      echo ""                                                             >> "${CONFIG_FILE}"
+      echo "; vim: filetype=dosini"                                       >> "${CONFIG_FILE}"
+    - |
+      echo "Generated '${CONFIG_FILE}':"
+      ls -l "${CONFIG_FILE}" || true
+      echo
+      echo "-->"
+      cat "${CONFIG_FILE}" | sed -e "s/^\(root_password\) .*/\1 = ********/" -e "s/^\(password\) .*/\1 = ********/"
+      echo "<-- EOF"
     # - bin/waitfor 1200
     - |
       echo "Creating 'etc/ldap.yaml' ..."
@@ -253,7 +254,7 @@ Linter:
        ls -l "etc/ldap.yaml" || true;
        echo;
        echo "-->";
-       cat "etc/ldap.yaml";
+       sed -e "s/\(bind_pw: \).*/\1********/" "etc/ldap.yaml";
        echo "<-- EOF"'
     - 'if [ "${SYSTEM_STATUS}" = "development" ] ; then
            echo "No build is done.";