From f9ba6e7c0978748506266aa0d9ff1cb1e9f1d70b Mon Sep 17 00:00:00 2001 From: kgala2 Date: Mon, 31 Mar 2025 13:59:13 -0700 Subject: [PATCH 1/2] build: add cloudbuild.yaml file for PSA tests --- .cl/cloudbuild.yaml | 88 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 .cl/cloudbuild.yaml diff --git a/.cl/cloudbuild.yaml b/.cl/cloudbuild.yaml new file mode 100644 index 000000000..5255f4b4d --- /dev/null +++ b/.cl/cloudbuild.yaml @@ -0,0 +1,88 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +steps: + - id: run integration tests for python version 3.9 + name: python:${_PYTHON_3.9} + 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.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: ["-"] +availableSecrets: + secretManager: + - versionName: 'projects/$PROJECT_ID/secrets/MYSQL_CONNECTION_NAME/versions/latest' + env: 'MYSQL_CONNECTION_NAME' + - versionName: 'projects/$PROJECT_ID/secrets/MYSQL_USER/versions/latest' + env: 'MYSQL_USER' + - versionName: 'projects/$PROJECT_ID/secrets/CLOUD_BUILD_MYSQL_IAM_USER/versions/latest' + env: 'MYSQL_IAM_USER' + - versionName: 'projects/$PROJECT_ID/secrets/MYSQL_PASS/versions/latest' + env: 'MYSQL_PASS' + - versionName: 'projects/$PROJECT_ID/secrets/MYSQL_DB/versions/latest' + env: 'MYSQL_DB' + - versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_CONNECTION_NAME/versions/latest' + env: 'POSTGRES_CONNECTION_NAME' + - versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_USER/versions/latest' + env: 'POSTGRES_USER' + - versionName: 'projects/$PROJECT_ID/secrets/CLOUD_BUILD_POSTGRES_IAM_USER/versions/latest' + env: 'POSTGRES_IAM_USER' + - versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_PASS/versions/latest' + env: 'POSTGRES_PASS' + - versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_DB/versions/latest' + env: 'POSTGRES_DB' + - versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_CAS_CONNECTION_NAME/versions/latest' + env: 'POSTGRES_CAS_CONNECTION_NAME' + - versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_CAS_PASS/versions/latest' + env: 'POSTGRES_CAS_PASS' + - versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_CUSTOMER_CAS_CONNECTION_NAME/versions/latest' + env: 'POSTGRES_CUSTOMER_CAS_CONNECTION_NAME' + - versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_CUSTOMER_CAS_PASS/versions/latest' + env: 'POSTGRES_CUSTOMER_CAS_PASS' + - versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_CUSTOMER_CAS_PASS_VALID_DOMAIN_NAME/versions/latest' + env: 'POSTGRES_CUSTOMER_CAS_PASS_VALID_DOMAIN_NAME' + - versionName: 'projects/$PROJECT_ID/secrets/SQLSERVER_CONNECTION_NAME/versions/latest' + env: 'SQLSERVER_CONNECTION_NAME' + - versionName: 'projects/$PROJECT_ID/secrets/SQLSERVER_USER/versions/latest' + env: 'SQLSERVER_USER' + - versionName: 'projects/$PROJECT_ID/secrets/SQLSERVER_PASS/versions/latest' + env: 'SQLSERVER_PASS' + - versionName: 'projects/$PROJECT_ID/secrets/SQLSERVER_DB/versions/latest' + env: 'SQLSERVER_DB' +substitutions: + _PYTHON_3.13: '3.13' + _PYTHON_3.9: '3.9' + +options: + dynamicSubstitutions: true + pool: + name: ${_POOL_NAME} + logging: CLOUD_LOGGING_ONLY \ No newline at end of file From 3cf842625dd97fc268e2441399916270c5f1d122 Mon Sep 17 00:00:00 2001 From: kgala2 Date: Mon, 31 Mar 2025 14:06:09 -0700 Subject: [PATCH 2/2] chore: update python reference variables --- .cl/cloudbuild.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.cl/cloudbuild.yaml b/.cl/cloudbuild.yaml index 5255f4b4d..01bb3b695 100644 --- a/.cl/cloudbuild.yaml +++ b/.cl/cloudbuild.yaml @@ -14,7 +14,7 @@ steps: - id: run integration tests for python version 3.9 - name: python:${_PYTHON_3.9} + name: python:${_PYTHON_3_9} entrypoint: bash env: - "IP_TYPE=private" @@ -23,10 +23,10 @@ steps: - "-c" - | pip install nox - nox -s system-${_PYTHON_3.9} + nox -s system-${_PYTHON_3_9} waitFor: ["-"] - id: run integration tests for python version 3.13 - name: python:${_PYTHON_3.13} + name: python:${_PYTHON_3_13} entrypoint: bash env: - "IP_TYPE=private" @@ -35,7 +35,7 @@ steps: - "-c" - | pip install nox - nox -s system-${_PYTHON_3.13} + nox -s system-${_PYTHON_3_13} waitFor: ["-"] availableSecrets: secretManager: @@ -78,8 +78,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' + _PYTHON_3_13: '3.13' + _PYTHON_3_9: '3.9' options: dynamicSubstitutions: true