Update cloudbuild.yaml

Author: kgala2

.cl/cloudbuild.yaml

@@ -13,30 +13,17 @@
 # limitations under the License.
 
 steps:
-  - id: run integration tests for python version 3.9
-    name: python:${_PYTHON_3_9}
+  - id: run integration tests
+    name: python:${_VERSION}
     entrypoint: bash
     env: 
-      - "IP_TYPE=private"
+      - "IP_TYPE=${_IP_TYPE}"
     secretEnv: ["MYSQL_CONNECTION_NAME", "MYSQL_USER", "MYSQL_IAM_USER", "MYSQL_PASS", "MYSQL_DB", "POSTGRES_CONNECTION_NAME", "POSTGRES_USER", "POSTGRES_IAM_USER", "POSTGRES_PASS", "POSTGRES_DB",  "POSTGRES_CAS_CONNECTION_NAME", "POSTGRES_CAS_PASS", "POSTGRES_CUSTOMER_CAS_CONNECTION_NAME", "POSTGRES_CUSTOMER_CAS_PASS", "POSTGRES_CUSTOMER_CAS_PASS_VALID_DOMAIN_NAME","SQLSERVER_CONNECTION_NAME", "SQLSERVER_USER", "SQLSERVER_PASS", "SQLSERVER_DB"]
     args:
       - "-c"
       - |
         pip install nox
-        nox -s system-${_PYTHON_3_9}
-    waitFor: ["-"]
-  - id: run integration tests for python version 3.13
-    name: python:${_PYTHON_3_13}
-    entrypoint: bash
-    env: 
-      - "IP_TYPE=private"
-    secretEnv: ["MYSQL_CONNECTION_NAME", "MYSQL_USER", "MYSQL_IAM_USER", "MYSQL_PASS", "MYSQL_DB", "POSTGRES_CONNECTION_NAME", "POSTGRES_USER", "POSTGRES_IAM_USER", "POSTGRES_PASS", "POSTGRES_DB",  "POSTGRES_CAS_CONNECTION_NAME", "POSTGRES_CAS_PASS", "POSTGRES_CUSTOMER_CAS_CONNECTION_NAME", "POSTGRES_CUSTOMER_CAS_PASS", "POSTGRES_CUSTOMER_CAS_PASS_VALID_DOMAIN_NAME","SQLSERVER_CONNECTION_NAME", "SQLSERVER_USER", "SQLSERVER_PASS", "SQLSERVER_DB"]
-    args:
-      - "-c"
-      - |
-        pip install nox
-        nox -s system-${_PYTHON_3_13}
-    waitFor: ["-"]
+        nox -s system-${_VERSION}
 availableSecrets:
   secretManager:
   - versionName: 'projects/$PROJECT_ID/secrets/MYSQL_CONNECTION_NAME/versions/latest'
@@ -78,8 +65,8 @@ availableSecrets:
   - versionName: 'projects/$PROJECT_ID/secrets/SQLSERVER_DB/versions/latest'
     env: 'SQLSERVER_DB'
 substitutions:
-  _PYTHON_3_13: '3.13'
-  _PYTHON_3_9: '3.9'
+  _VERSION: ${_VERSION}
+  _IP_TYPE: ${_IP_TYPE}
 
 options:
   dynamicSubstitutions: true