[sdk] Use fuchsia/build.py subbuilds
Flip switch to fuchsia/build.py subbuilds.
Bug: 37259
Change-Id: I2fd16d3dbcd513cf29983ce6cc959642161e9eac
diff --git a/recipes/sdk.expected/local_ci.json b/recipes/sdk.expected/local_ci.json
index 397566c..f688535 100644
--- a/recipes/sdk.expected/local_ci.json
+++ b/recipes/sdk.expected/local_ci.json
@@ -199,7 +199,7 @@
],
"infra_step": true,
"name": "schedule sdk builds",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"sdk-core-subbuild-arm64-linux\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"sdk-core-subbuild-x64-linux\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"sdk-core-linux-arm64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"sdk-core-linux-x64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -207,7 +207,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"ci\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-arm64-linux\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-linux-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514000\"@@@",
@@ -217,7 +217,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"ci\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-x64-linux\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-linux-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514001\"@@@",
@@ -232,7 +232,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"ci\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-arm64-linux\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-linux-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
@@ -260,7 +260,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"ci\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-x64-linux\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-linux-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
@@ -520,8 +520,8 @@
"infra_step": true,
"name": "get_sdk_paths",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-subbuild-arm64-linux/core.tar.gz@@@",
- "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-linux-arm64-build_only/core.tar.gz@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
@@ -533,7 +533,7 @@
"--json-output",
"/path/to/tmp/json",
"move",
- "[START_DIR]/fuchsia/archives/sdk-core-subbuild-arm64-linux/core.tar.gz",
+ "[START_DIR]/fuchsia/archives/sdk-core-linux-arm64-build_only/core.tar.gz",
"[CLEANUP]/merged_sdk_archive.tar.gz"
],
"infra_step": true,
@@ -545,13 +545,13 @@
"-u",
"[START_DIR]/fuchsia/scripts/sdk/merger/merge.py",
"--first-archive",
- "[START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz",
+ "[START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz",
"--second-archive",
"[CLEANUP]/merged_sdk_archive.tar.gz",
"--output-archive",
"[CLEANUP]/merged_sdk_archive.tar.gz"
],
- "name": "merge [START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz"
+ "name": "merge [START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz"
},
{
"cmd": [
diff --git a/recipes/sdk.expected/local_ci_build_failure.json b/recipes/sdk.expected/local_ci_build_failure.json
index af69fc3..e309c18 100644
--- a/recipes/sdk.expected/local_ci_build_failure.json
+++ b/recipes/sdk.expected/local_ci_build_failure.json
@@ -199,7 +199,7 @@
],
"infra_step": true,
"name": "schedule sdk builds",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"###global-integration-bucket###\", \"builder\": \"sdk-core-subbuild-arm64-linux\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"###global-integration-bucket###\", \"builder\": \"sdk-core-subbuild-x64-linux\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"###global-integration-bucket###\", \"builder\": \"sdk-core-linux-arm64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"###global-integration-bucket###\", \"builder\": \"sdk-core-linux-x64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -207,7 +207,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"###global-integration-bucket###\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-arm64-linux\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-linux-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514000\"@@@",
@@ -217,7 +217,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"###global-integration-bucket###\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-x64-linux\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-linux-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514001\"@@@",
@@ -232,7 +232,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"###global-integration-bucket###\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-arm64-linux\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-linux-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
@@ -260,7 +260,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"###global-integration-bucket###\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-x64-linux\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-linux-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
diff --git a/recipes/sdk.expected/local_ci_infra_failure.json b/recipes/sdk.expected/local_ci_infra_failure.json
index 763d3e0..8fec59f 100644
--- a/recipes/sdk.expected/local_ci_infra_failure.json
+++ b/recipes/sdk.expected/local_ci_infra_failure.json
@@ -199,7 +199,7 @@
],
"infra_step": true,
"name": "schedule sdk builds",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"###global-integration-bucket###\", \"builder\": \"sdk-core-subbuild-arm64-linux\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"###global-integration-bucket###\", \"builder\": \"sdk-core-subbuild-x64-linux\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"###global-integration-bucket###\", \"builder\": \"sdk-core-linux-arm64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"###global-integration-bucket###\", \"builder\": \"sdk-core-linux-x64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -207,7 +207,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"###global-integration-bucket###\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-arm64-linux\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-linux-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514000\"@@@",
@@ -217,7 +217,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"###global-integration-bucket###\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-x64-linux\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-linux-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514001\"@@@",
@@ -232,7 +232,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"###global-integration-bucket###\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-arm64-linux\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-linux-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
@@ -260,7 +260,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"###global-integration-bucket###\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-x64-linux\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-linux-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
diff --git a/recipes/sdk.expected/local_ci_mac.json b/recipes/sdk.expected/local_ci_mac.json
index f9f4cfb..063b2c3 100644
--- a/recipes/sdk.expected/local_ci_mac.json
+++ b/recipes/sdk.expected/local_ci_mac.json
@@ -199,7 +199,7 @@
],
"infra_step": true,
"name": "schedule sdk builds",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"sdk-core-subbuild-arm64-mac\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"sdk-core-subbuild-x64-mac\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"sdk-core-mac-arm64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"sdk-core-mac-x64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -207,7 +207,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"ci\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-arm64-mac\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-mac-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514000\"@@@",
@@ -217,7 +217,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"ci\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-x64-mac\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-mac-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514001\"@@@",
@@ -232,7 +232,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"ci\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-arm64-mac\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-mac-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
@@ -260,7 +260,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"ci\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-x64-mac\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-mac-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
@@ -520,8 +520,8 @@
"infra_step": true,
"name": "get_sdk_paths",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-subbuild-arm64-mac/core.tar.gz@@@",
- "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-mac/core.tar.gz@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-mac-arm64-build_only/core.tar.gz@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-mac-x64-build_only/core.tar.gz@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
@@ -533,7 +533,7 @@
"--json-output",
"/path/to/tmp/json",
"move",
- "[START_DIR]/fuchsia/archives/sdk-core-subbuild-arm64-mac/core.tar.gz",
+ "[START_DIR]/fuchsia/archives/sdk-core-mac-arm64-build_only/core.tar.gz",
"[CLEANUP]/merged_sdk_archive.tar.gz"
],
"infra_step": true,
@@ -545,13 +545,13 @@
"-u",
"[START_DIR]/fuchsia/scripts/sdk/merger/merge.py",
"--first-archive",
- "[START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-mac/core.tar.gz",
+ "[START_DIR]/fuchsia/archives/sdk-core-mac-x64-build_only/core.tar.gz",
"--second-archive",
"[CLEANUP]/merged_sdk_archive.tar.gz",
"--output-archive",
"[CLEANUP]/merged_sdk_archive.tar.gz"
],
- "name": "merge [START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-mac/core.tar.gz"
+ "name": "merge [START_DIR]/fuchsia/archives/sdk-core-mac-x64-build_only/core.tar.gz"
},
{
"cmd": [
diff --git a/recipes/sdk.expected/local_cq.json b/recipes/sdk.expected/local_cq.json
index eb16d8e..ac65bc5 100644
--- a/recipes/sdk.expected/local_cq.json
+++ b/recipes/sdk.expected/local_cq.json
@@ -288,7 +288,7 @@
],
"infra_step": true,
"name": "schedule sdk builds",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"sdk-core-subbuild-arm64-linux\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"chromium-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"project\"}], \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"sdk-core-subbuild-x64-linux\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"chromium-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"project\"}], \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"sdk-core-linux-arm64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"chromium-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"project\"}], \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"sdk-core-linux-x64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"chromium-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"project\"}], \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -296,7 +296,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"try\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-arm64-linux\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-linux-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514000\"@@@",
@@ -306,7 +306,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"try\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-x64-linux\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-linux-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514001\"@@@",
@@ -321,7 +321,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"try\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-arm64-linux\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-linux-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
@@ -355,7 +355,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"try\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-x64-linux\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-linux-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
@@ -637,8 +637,8 @@
"infra_step": true,
"name": "get_sdk_paths",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-subbuild-arm64-linux/core.tar.gz@@@",
- "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-linux-arm64-build_only/core.tar.gz@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
@@ -650,7 +650,7 @@
"--json-output",
"/path/to/tmp/json",
"move",
- "[START_DIR]/fuchsia/archives/sdk-core-subbuild-arm64-linux/core.tar.gz",
+ "[START_DIR]/fuchsia/archives/sdk-core-linux-arm64-build_only/core.tar.gz",
"[CLEANUP]/merged_sdk_archive.tar.gz"
],
"infra_step": true,
@@ -662,13 +662,13 @@
"-u",
"[START_DIR]/fuchsia/scripts/sdk/merger/merge.py",
"--first-archive",
- "[START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz",
+ "[START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz",
"--second-archive",
"[CLEANUP]/merged_sdk_archive.tar.gz",
"--output-archive",
"[CLEANUP]/merged_sdk_archive.tar.gz"
],
- "name": "merge [START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz"
+ "name": "merge [START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz"
},
{
"cmd": [
diff --git a/recipes/sdk.expected/release_ci_image_failure.json b/recipes/sdk.expected/release_ci_image_failure.json
index 14e3633..253a9b9 100644
--- a/recipes/sdk.expected/release_ci_image_failure.json
+++ b/recipes/sdk.expected/release_ci_image_failure.json
@@ -238,7 +238,7 @@
],
"infra_step": true,
"name": "schedule sdk builds",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"###global-integration-bucket###\", \"builder\": \"sdk-core-subbuild-arm64-linux\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"###global-integration-bucket###\", \"builder\": \"sdk-core-subbuild-x64-linux\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"###global-integration-bucket###\", \"builder\": \"sdk-core-linux-arm64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"###global-integration-bucket###\", \"builder\": \"sdk-core-linux-x64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -246,7 +246,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"###global-integration-bucket###\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-arm64-linux\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-linux-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514000\"@@@",
@@ -256,7 +256,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"###global-integration-bucket###\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-x64-linux\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-linux-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514001\"@@@",
@@ -271,7 +271,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"###global-integration-bucket###\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-arm64-linux\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-linux-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
@@ -299,7 +299,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"###global-integration-bucket###\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-x64-linux\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-linux-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
@@ -658,8 +658,8 @@
"infra_step": true,
"name": "get_sdk_paths",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-subbuild-arm64-linux/core.tar.gz@@@",
- "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-linux-arm64-build_only/core.tar.gz@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
@@ -671,7 +671,7 @@
"--json-output",
"/path/to/tmp/json",
"move",
- "[START_DIR]/fuchsia/archives/sdk-core-subbuild-arm64-linux/core.tar.gz",
+ "[START_DIR]/fuchsia/archives/sdk-core-linux-arm64-build_only/core.tar.gz",
"[CLEANUP]/merged_sdk_archive.tar.gz"
],
"infra_step": true,
@@ -683,13 +683,13 @@
"-u",
"[START_DIR]/fuchsia/scripts/sdk/merger/merge.py",
"--first-archive",
- "[START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz",
+ "[START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz",
"--second-archive",
"[CLEANUP]/merged_sdk_archive.tar.gz",
"--output-archive",
"[CLEANUP]/merged_sdk_archive.tar.gz"
],
- "name": "merge [START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz"
+ "name": "merge [START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz"
},
{
"cmd": [
diff --git a/recipes/sdk.expected/release_ci_new_upload.json b/recipes/sdk.expected/release_ci_new_upload.json
index 96b8188..1e92133 100644
--- a/recipes/sdk.expected/release_ci_new_upload.json
+++ b/recipes/sdk.expected/release_ci_new_upload.json
@@ -238,7 +238,7 @@
],
"infra_step": true,
"name": "schedule sdk builds",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"###global-integration-bucket###\", \"builder\": \"sdk-core-subbuild-arm64-linux\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/release\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"###global-integration-bucket###\", \"builder\": \"sdk-core-subbuild-x64-linux\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/release\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"###global-integration-bucket###\", \"builder\": \"sdk-core-linux-arm64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/release\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"###global-integration-bucket###\", \"builder\": \"sdk-core-linux-x64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/release\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -246,7 +246,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"###global-integration-bucket###\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-arm64-linux\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-linux-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514000\"@@@",
@@ -256,7 +256,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"###global-integration-bucket###\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-x64-linux\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-linux-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514001\"@@@",
@@ -271,7 +271,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"###global-integration-bucket###\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-arm64-linux\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-linux-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
@@ -299,7 +299,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"###global-integration-bucket###\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-x64-linux\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-linux-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
@@ -658,8 +658,8 @@
"infra_step": true,
"name": "get_sdk_paths",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-subbuild-arm64-linux/core.tar.gz@@@",
- "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-linux-arm64-build_only/core.tar.gz@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
@@ -671,7 +671,7 @@
"--json-output",
"/path/to/tmp/json",
"move",
- "[START_DIR]/fuchsia/archives/sdk-core-subbuild-arm64-linux/core.tar.gz",
+ "[START_DIR]/fuchsia/archives/sdk-core-linux-arm64-build_only/core.tar.gz",
"[CLEANUP]/merged_sdk_archive.tar.gz"
],
"infra_step": true,
@@ -683,13 +683,13 @@
"-u",
"[START_DIR]/fuchsia/scripts/sdk/merger/merge.py",
"--first-archive",
- "[START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz",
+ "[START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz",
"--second-archive",
"[CLEANUP]/merged_sdk_archive.tar.gz",
"--output-archive",
"[CLEANUP]/merged_sdk_archive.tar.gz"
],
- "name": "merge [START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz"
+ "name": "merge [START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz"
},
{
"cmd": [
diff --git a/recipes/sdk.expected/snapshot_ci.json b/recipes/sdk.expected/snapshot_ci.json
index 960766a..6c3aa09 100644
--- a/recipes/sdk.expected/snapshot_ci.json
+++ b/recipes/sdk.expected/snapshot_ci.json
@@ -263,7 +263,7 @@
],
"infra_step": true,
"name": "schedule sdk builds",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"sdk-core-subbuild-arm64-linux\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"sdk-core-subbuild-x64-linux\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"sdk-core-linux-arm64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"sdk-core-linux-x64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"fuchsia.googlesource.com\", \"id\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\", \"project\": \"topaz\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -271,7 +271,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"ci\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-arm64-linux\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-linux-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514000\"@@@",
@@ -281,7 +281,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"ci\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-x64-linux\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-linux-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514001\"@@@",
@@ -296,7 +296,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"ci\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-arm64-linux\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-linux-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
@@ -324,7 +324,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"ci\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-x64-linux\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-linux-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
@@ -584,8 +584,8 @@
"infra_step": true,
"name": "get_sdk_paths",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-subbuild-arm64-linux/core.tar.gz@@@",
- "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-linux-arm64-build_only/core.tar.gz@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
@@ -597,7 +597,7 @@
"--json-output",
"/path/to/tmp/json",
"move",
- "[START_DIR]/fuchsia/archives/sdk-core-subbuild-arm64-linux/core.tar.gz",
+ "[START_DIR]/fuchsia/archives/sdk-core-linux-arm64-build_only/core.tar.gz",
"[CLEANUP]/merged_sdk_archive.tar.gz"
],
"infra_step": true,
@@ -609,13 +609,13 @@
"-u",
"[START_DIR]/fuchsia/scripts/sdk/merger/merge.py",
"--first-archive",
- "[START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz",
+ "[START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz",
"--second-archive",
"[CLEANUP]/merged_sdk_archive.tar.gz",
"--output-archive",
"[CLEANUP]/merged_sdk_archive.tar.gz"
],
- "name": "merge [START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz"
+ "name": "merge [START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz"
},
{
"cmd": [
diff --git a/recipes/sdk.expected/snapshot_cq.json b/recipes/sdk.expected/snapshot_cq.json
index 7bc6888..6bf48db6 100644
--- a/recipes/sdk.expected/snapshot_cq.json
+++ b/recipes/sdk.expected/snapshot_cq.json
@@ -361,7 +361,7 @@
],
"infra_step": true,
"name": "schedule sdk builds",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"sdk-core-subbuild-arm64-linux\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"chromium-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"project\"}], \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"sdk-core-subbuild-x64-linux\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"chromium-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"project\"}], \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"sdk-core-linux-arm64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"chromium-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"project\"}], \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"sdk-core-linux-x64-build_only\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"chromium-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"project\"}], \"properties\": {\"parent_id\": \"8945511751514863184\", \"sdk_id\": \"8945511751514863184\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -369,7 +369,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"try\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-arm64-linux\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-linux-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514000\"@@@",
@@ -379,7 +379,7 @@
"@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"bucket\": \"try\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-subbuild-x64-linux\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"builder\": \"sdk-core-linux-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514001\"@@@",
@@ -394,7 +394,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"try\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-arm64-linux\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-linux-arm64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
@@ -428,7 +428,7 @@
"@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
"@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bucket\": \"try\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-subbuild-x64-linux\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"builder\": \"sdk-core-linux-x64-build_only\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"project\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
@@ -710,8 +710,8 @@
"infra_step": true,
"name": "get_sdk_paths",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-subbuild-arm64-linux/core.tar.gz@@@",
- "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-linux-arm64-build_only/core.tar.gz@@@",
+ "@@@STEP_LOG_LINE@glob@[START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz@@@",
"@@@STEP_LOG_END@glob@@@"
]
},
@@ -723,7 +723,7 @@
"--json-output",
"/path/to/tmp/json",
"move",
- "[START_DIR]/fuchsia/archives/sdk-core-subbuild-arm64-linux/core.tar.gz",
+ "[START_DIR]/fuchsia/archives/sdk-core-linux-arm64-build_only/core.tar.gz",
"[CLEANUP]/merged_sdk_archive.tar.gz"
],
"infra_step": true,
@@ -735,13 +735,13 @@
"-u",
"[START_DIR]/fuchsia/scripts/sdk/merger/merge.py",
"--first-archive",
- "[START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz",
+ "[START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz",
"--second-archive",
"[CLEANUP]/merged_sdk_archive.tar.gz",
"--output-archive",
"[CLEANUP]/merged_sdk_archive.tar.gz"
],
- "name": "merge [START_DIR]/fuchsia/archives/sdk-core-subbuild-x64-linux/core.tar.gz"
+ "name": "merge [START_DIR]/fuchsia/archives/sdk-core-linux-x64-build_only/core.tar.gz"
},
{
"cmd": [
diff --git a/recipes/sdk.py b/recipes/sdk.py
index cdf3b85..ce5c93a 100644
--- a/recipes/sdk.py
+++ b/recipes/sdk.py
@@ -73,15 +73,6 @@
kind=str,
help='The CIPD package root for upload.',
default='fuchsia'),
- 'use_subbuilders':
- Property(
- kind=bool,
- help='Use fuchsia/build.py subbuilders to generate SDK archives.',
- # TODO(fxb/40777): Make this required. This is optional for a
- # soft-transition away from sdk_subbuild.py to fuchsia/build.py.
- # If this property is set, use these fuchsia/build.py subbuilders
- # instead of the default sdk_subbuild.py.
- default=False),
'companion_images':
Property(
kind=List(dict),
@@ -154,8 +145,7 @@
def RunSteps(api, manifest, remote, checkout_snapshot, gcs_bucket, sdk_name,
- cipd_root, use_subbuilders, companion_images, publish_branch,
- sdk_id):
+ cipd_root, companion_images, publish_branch, sdk_id):
build = api.buildbucket.build
revision = build.input.gitiles_commit.id
@@ -203,17 +193,10 @@
subbuild_properties = {'sdk_id': sdk_id, 'parent_id': sdk_id}
sdk_schedule_reqs = []
- # TODO (fxb/40777): Make this unconditionally use subbuilders.
- if not use_subbuilders:
- builder_names = [
- 'sdk-%s-subbuild-%s-%s' % (sdk_name, target, api.platform.name)
- for target in TARGETS
- ]
- else:
- builder_names = [
- 'sdk-%s-%s-%s-build_only' % (sdk_name, api.platform.name, target)
- for target in TARGETS
- ]
+ builder_names = [
+ 'sdk-%s-%s-%s-build_only' % (sdk_name, api.platform.name, target)
+ for target in TARGETS
+ ]
for builder_name in builder_names:
sdk_schedule_reqs.append(
@@ -662,13 +645,11 @@
yield (api.test('global_ci') + topaz_global_ci + ci_subbuilds +
api.properties(
companion_images=companion_images,
- use_subbuilders=True,
publish_branch=publish_branch,
) + failed_describe)
yield (api.test('release_ci') + topaz_release_ci + ci_subbuilds +
ci_image_builds + api.properties(
companion_images=companion_images,
- use_subbuilders=True,
publish_branch=publish_branch,
) + describe + release_versions)
yield (api.test('local_ci_build_failure') + topaz_global_ci +
