Changing variables in .gitlab-ci.yml for having different VSphere API users in test...

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c393637b096e809046e313857cfe6690339b5e1b..8a18ef2ea9a7a1ad9445f1c043cf7df2bf983b68 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,8 +22,12 @@ variables:
   VSPHERE_HOST_PROD: 'vcs01.pixelpark.net'
   VSPHERE_HOST_TEST: 'test-vcsa01.pixelpark.net'
   VSPHERE_API_PORT: 443
-  VSPHERE_API_USER: 'api-user'
+  VSPHERE_API_USER: ''
+  VSPHERE_API_USER_PROD: 'prd-vmware-terraform'
+  VSPHERE_API_USER_TEST: 'tst-vmware-terraform'
+  VSPHERE_API_PASSWD: ''
   VSPHERE_API_PASSWD_PROD: 'secret'
+  VSPHERE_API_PASSWD_TEST: 'secret'
   VSPHERE_DC: ''
   VSPHERE_DC_PROD: 'vmcc'
   VSPHERE_DC_TEST: 'test-vmcc'
@@ -132,6 +136,8 @@ default:
           if [ -z "${VSPHERE_DC}" ] ; then VSPHERE_DC="${VSPHERE_DC_PROD}"; fi
           if [ -z "${VSPHERE_CLUSTER}" ] ; then VSPHERE_CLUSTER="${VSPHERE_CLUSTER_PROD}"; fi
           if [ -z "${VSPHERE_STORAGE_CLUSTER}" ] ; then VSPHERE_STORAGE_CLUSTER="${VSPHERE_STORAGE_CLUSTER_PROD}"; fi
+          if [ -z "${VSPHERE_API_USER}" ] ; then VSPHERE_API_USER="${VSPHERE_API_USER_PROD}"; fi
+          if [ -z "${VSPHERE_API_PASSWD}" ] ; then VSPHERE_API_PASSWD="${VSPHERE_API_PASSWD_PROD}"; fi
           if [ -z "${COBBLER_HOST}" ] ; then COBBLER_HOST="${COBBLER_HOST_PROD}"; fi
           if [ -z "${COBBLER_SSH_USER}" ] ; then COBBLER_SSH_USER="${COBBLER_SSH_USER_PROD}"; fi
           if [ -z "${COBBLER_TEMPLATES_DIR}" ] ; then COBBLER_TEMPLATES_DIR="${COBBLER_TEMPLATES_DIR_PROD}"; fi
@@ -144,6 +150,8 @@ default:
           if [ -z "${VSPHERE_DC}" ] ; then VSPHERE_DC="${VSPHERE_DC_TEST}"; fi;
           if [ -z "${VSPHERE_CLUSTER}" ] ; then VSPHERE_CLUSTER="${VSPHERE_CLUSTER_TEST}"; fi;
           if [ -z "${VSPHERE_STORAGE_CLUSTER}" ] ; then VSPHERE_STORAGE_CLUSTER="${VSPHERE_STORAGE_CLUSTER_TEST}"; fi;
+          if [ -z "${VSPHERE_API_USER}" ] ; then VSPHERE_API_USER="${VSPHERE_API_USER_TEST}"; fi
+          if [ -z "${VSPHERE_API_PASSWD}" ] ; then VSPHERE_API_PASSWD="${VSPHERE_API_PASSWD_TEST}"; fi
           if [ -z "${COBBLER_HOST}" ] ; then COBBLER_HOST="${COBBLER_HOST_TEST}"; fi;
           if [ -z "${COBBLER_SSH_USER}" ] ; then COBBLER_SSH_USER="${COBBLER_SSH_USER_TEST}"; fi;
           if [ -z "${COBBLER_TEMPLATES_DIR}" ] ; then COBBLER_TEMPLATES_DIR="${COBBLER_TEMPLATES_DIR_TEST}"; fi;
@@ -223,7 +231,7 @@ Linter:
       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 "password = ${VSPHERE_API_PASSWD}"                             >> "${CONFIG_FILE}"
       echo "dc = ${VSPHERE_DC}"                                           >> "${CONFIG_FILE}"
       echo "cluster = ${VSPHERE_CLUSTER}"                                 >> "${CONFIG_FILE}"
       echo "folder = ${VSPHERE_VM_FOLDER}"                                >> "${CONFIG_FILE}"