test removing circleci

googleapis · Oct 27, 2022 · f3ced37 · f3ced37
1 parent f44704b
commit f3ced37
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 32 deletions.
diff --git a/.kokoro/trampoline_v2.sh b/.kokoro/trampoline_v2.sh
@@ -203,29 +203,29 @@ elif [[ -n "${GITHUB_RUN_ID:-}" ]]; then
 	"GITHUB_HEAD_REF"
 	"GITHUB_BASE_REF"
     )
-elif [[ "${CIRCLECI:-}" == "true" ]]; then
-    RUNNING_IN_CI="true"
-    TRAMPOLINE_CI="circleci"
-    pass_down_envvars+=(
-	"CIRCLE_BRANCH"
-	"CIRCLE_BUILD_NUM"
-	"CIRCLE_BUILD_URL"
-	"CIRCLE_COMPARE_URL"
-	"CIRCLE_JOB"
-	"CIRCLE_NODE_INDEX"
-	"CIRCLE_NODE_TOTAL"
-	"CIRCLE_PREVIOUS_BUILD_NUM"
-	"CIRCLE_PROJECT_REPONAME"
-	"CIRCLE_PROJECT_USERNAME"
-	"CIRCLE_REPOSITORY_URL"
-	"CIRCLE_SHA1"
-	"CIRCLE_STAGE"
-	"CIRCLE_USERNAME"
-	"CIRCLE_WORKFLOW_ID"
-	"CIRCLE_WORKFLOW_JOB_ID"
-	"CIRCLE_WORKFLOW_UPSTREAM_JOB_IDS"
-	"CIRCLE_WORKFLOW_WORKSPACE_ID"
-    )
+# elif [[ "${CIRCLECI:-}" == "true" ]]; then
+#     RUNNING_IN_CI="true"
+#     TRAMPOLINE_CI="circleci"
+#     pass_down_envvars+=(
+# 	"CIRCLE_BRANCH"
+# 	"CIRCLE_BUILD_NUM"
+# 	"CIRCLE_BUILD_URL"
+# 	"CIRCLE_COMPARE_URL"
+# 	"CIRCLE_JOB"
+# 	"CIRCLE_NODE_INDEX"
+# 	"CIRCLE_NODE_TOTAL"
+# 	"CIRCLE_PREVIOUS_BUILD_NUM"
+# 	"CIRCLE_PROJECT_REPONAME"
+# 	"CIRCLE_PROJECT_USERNAME"
+# 	"CIRCLE_REPOSITORY_URL"
+# 	"CIRCLE_SHA1"
+# 	"CIRCLE_STAGE"
+# 	"CIRCLE_USERNAME"
+# 	"CIRCLE_WORKFLOW_ID"
+# 	"CIRCLE_WORKFLOW_JOB_ID"
+# 	"CIRCLE_WORKFLOW_UPSTREAM_JOB_IDS"
+# 	"CIRCLE_WORKFLOW_WORKSPACE_ID"
+#     )
 fi
 
 # Configure the service account for pulling the docker image.

diff --git a/tests/system/conftest.py b/tests/system/conftest.py
@@ -16,15 +16,15 @@
 REPO_DIR = pathlib.Path(__file__).parent.parent.parent
 
 
-# TODO: remove when fully migrated off of Circle CI
-@pytest.fixture(scope="session", autouse=True)
-def default_credentials():
-    """Setup application default credentials for use in code samples."""
-    # Written by the 'ci/config_auth.sh' script.
-    path = REPO_DIR / "ci" / "service_account.json"
-
-    if path.is_file() and "GOOGLE_APPLICATION_CREDENTIALS" not in os.environ:
-        os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = str(path)
+# # TODO: remove when fully migrated off of Circle CI
+# @pytest.fixture(scope="session", autouse=True)
+# def default_credentials():
+#     """Setup application default credentials for use in code samples."""
+#     # Written by the 'ci/config_auth.sh' script.
+#     path = REPO_DIR / "ci" / "service_account.json"
+
+#     if path.is_file() and "GOOGLE_APPLICATION_CREDENTIALS" not in os.environ:
+#         os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = str(path)
 
 
 @pytest.fixture(scope="session", autouse=True)