cherrypick #50836 (#50840)

set project id

Signed-off-by: Lonnie Liu <lonnie@anyscale.com>

Author: aslonnie

release/ray_release/buildkite/step.py

@@ -5,7 +5,12 @@
 from ray_release.aws import RELEASE_AWS_BUCKET
 from ray_release.buildkite.concurrency import get_concurrency_group
 from ray_release.test import Test, TestState
-from ray_release.config import DEFAULT_ANYSCALE_PROJECT, DEFAULT_CLOUD_ID, as_smoke_test
+from ray_release.config import (
+    DEFAULT_ANYSCALE_PROJECT,
+    DEFAULT_CLOUD_ID,
+    as_smoke_test,
+    get_test_project_id,
+)
 from ray_release.env import DEFAULT_ENVIRONMENT, load_environment
 from ray_release.template import get_test_env_var
 from ray_release.util import DeferredEnvVar
@@ -136,6 +141,10 @@ def get_step(
     env_dict = load_environment(env_to_use)
     env_dict.update(env)
 
+    # Set the project id for the test
+    project_id = get_test_project_id(test)
+    env_dict["ANYSCALE_PROJECT"] = project_id
+
     step["env"].update(env_dict)
     step["plugins"][0][DOCKER_PLUGIN_KEY]["image"] = "python:3.9"
 

release/ray_release/config.py

@@ -31,7 +31,7 @@
 )
 DEFAULT_ANYSCALE_PROJECT = DeferredEnvVar(
     "RELEASE_DEFAULT_PROJECT",
-    "prj_FKRmeV5pA6X72aVscFALNC32",
+    "prj_rw3kzbqsehh4a6klka7j616fgb",
 )
 
 RELEASE_PACKAGE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
@@ -253,3 +253,8 @@ def get_test_cloud_id(test: Test) -> str:
     else:
         cloud_id = cloud_id or str(DEFAULT_CLOUD_ID)
     return cloud_id
+
+
+def get_test_project_id(test: Test) -> str:
+    default_project_id = str(DEFAULT_ANYSCALE_PROJECT)
+    return test.get("cluster", {}).get("project_id", default_project_id)

release/ray_release/environments/aws.env

@@ -2,4 +2,3 @@ ANYSCALE_HOST=https://console.anyscale-staging.com
 RELEASE_AWS_ANYSCALE_SECRET_ARN="arn:aws:secretsmanager:us-west-2:029272617770:secret:release-automation/anyscale-staging-token20231008005227440600000001-JTgxb0"
 RELEASE_DEFAULT_CLOUD_ID="cld_kvedZWag2qA8i5BjxUevf5i7"
 RELEASE_DEFAULT_PROJECT="prj_92c7b71w55flm6gv6imv4m6vqg"
-ANYSCALE_PROJECT="prj_92c7b71w55flm6gv6imv4m6vqg"

release/ray_release/environments/aws_perf.env

@@ -2,4 +2,3 @@ ANYSCALE_HOST=https://console.anyscale-staging.com
 RELEASE_AWS_ANYSCALE_SECRET_ARN="arn:aws:secretsmanager:us-west-2:029272617770:secret:release-automation/anyscale-staging-token20231008005227440600000001-JTgxb0"
 RELEASE_DEFAULT_CLOUD_ID="cld_kvedZWag2qA8i5BjxUevf5i7"
 RELEASE_DEFAULT_PROJECT="prj_6rfevmf12tbsbd6g3al5f6zssh"
-ANYSCALE_PROJECT="prj_6rfevmf12tbsbd6g3al5f6zssh"

release/ray_release/environments/gce.env

@@ -3,5 +3,4 @@ ANYSCALE_CLOUD_STORAGE_PROVIDER=gs
 RELEASE_AWS_ANYSCALE_SECRET_ARN="arn:aws:secretsmanager:us-west-2:029272617770:secret:release-automation/anyscale-staging-token20231008005227440600000001-JTgxb0"
 RELEASE_DEFAULT_CLOUD_ID="cld_vy7xqacrvddvbuy95auinvuqmt"
 RELEASE_DEFAULT_PROJECT="prj_xqmpk8ps6civt438u1hp5pi88g"
-ANYSCALE_PROJECT="prj_xqmpk8ps6civt438u1hp5pi88g"
 GOOGLE_CLOUD_PROJECT="anyscale-oss-ci"

release/ray_release/schema.json

@@ -82,6 +82,9 @@
 				"cloud_id": {
 					"type": "string"
 				},
+				"project_id": {
+					"type": "string"
+				},
 				"cloud_name": {
 					"type": "string"
 				},

release/release_tests.yaml

@@ -1973,6 +1973,7 @@
     byod: {}
     cluster_compute: compute_tpl_single_node_32_cpu.yaml
     cloud_id: cld_wy5a6nhazplvu32526ams61d98
+    project_id: prj_lhlrf1u5yv8qz9qg3xzw8fkiiq
 
   run:
     timeout: 7200
@@ -1995,6 +1996,7 @@
     byod: {}
     cluster_compute: compute_tpl_32_cpu.yaml
     cloud_id: cld_wy5a6nhazplvu32526ams61d98
+    project_id: prj_lhlrf1u5yv8qz9qg3xzw8fkiiq
 
   run:
     timeout: 7200
@@ -2025,6 +2027,7 @@
       type: gpu
     cluster_compute: compute_tpl_single_node_32_cpu.yaml
     cloud_id: cld_wy5a6nhazplvu32526ams61d98
+    project_id: prj_lhlrf1u5yv8qz9qg3xzw8fkiiq
 
   run:
     timeout: 7200
@@ -2047,6 +2050,7 @@
     byod: {}
     cluster_compute: compute_tpl_single_node_32_cpu.yaml
     cloud_id: cld_wy5a6nhazplvu32526ams61d98
+    project_id: prj_lhlrf1u5yv8qz9qg3xzw8fkiiq
 
   run:
     timeout: 7200
@@ -2075,6 +2079,7 @@
       type: gpu
     cluster_compute: compute_tpl_gpu_node.yaml
     cloud_id: cld_wy5a6nhazplvu32526ams61d98
+    project_id: prj_lhlrf1u5yv8qz9qg3xzw8fkiiq
 
   run:
     timeout: 7200