[cobalt_config] Update project name and paths of cobalt and
cobalt_config repos to match what's in the manifest.
Bug: 43843
Change-Id: I7f3c8b5cd164ba9be0741a65041e62219ae11fea
diff --git a/recipes/cobalt_config.expected/ci.json b/recipes/cobalt_config.expected/ci.json
index 01b85c7..9928930 100644
--- a/recipes/cobalt_config.expected/ci.json
+++ b/recipes/cobalt_config.expected/ci.json
@@ -66,7 +66,7 @@
"-time",
"-j=50",
"-name",
- "cobalt_config",
+ "cobalt-registry",
"-revision",
"2d72510e447ab60a9728aeea2362d8be2cbd7789",
"config.manifest",
@@ -143,7 +143,7 @@
"./cobaltb.py",
"setup"
],
- "cwd": "[START_DIR]/cobalt",
+ "cwd": "[START_DIR]/third_party/cobalt",
"name": "setup"
},
{
@@ -155,7 +155,7 @@
"--out_dir",
"[START_DIR]/tools"
],
- "cwd": "[START_DIR]/cobalt",
+ "cwd": "[START_DIR]/third_party/cobalt",
"name": "build"
},
{
@@ -164,7 +164,7 @@
"--output_file",
"[START_DIR]/new_config",
"--config_dir",
- "[START_DIR]/config"
+ "[START_DIR]/third_party/cobalt_config"
],
"name": "check config"
},
@@ -174,7 +174,7 @@
"checkout",
"HEAD^"
],
- "cwd": "[START_DIR]/config",
+ "cwd": "[START_DIR]/third_party/cobalt_config",
"name": "checkout parent"
},
{
@@ -183,7 +183,7 @@
"--output_file",
"[START_DIR]/old_config",
"--config_dir",
- "[START_DIR]/config"
+ "[START_DIR]/third_party/cobalt_config"
],
"name": "check parent config"
},
@@ -193,7 +193,7 @@
"checkout",
"-"
],
- "cwd": "[START_DIR]/config",
+ "cwd": "[START_DIR]/third_party/cobalt_config",
"name": "checkout head"
},
{
@@ -203,7 +203,7 @@
"-s",
"--format=%b"
],
- "cwd": "[START_DIR]/config",
+ "cwd": "[START_DIR]/third_party/cobalt_config",
"name": "read commit message"
},
{
diff --git a/recipes/cobalt_config.expected/cq_try.json b/recipes/cobalt_config.expected/cq_try.json
index 4cc487a..3f9c489 100644
--- a/recipes/cobalt_config.expected/cq_try.json
+++ b/recipes/cobalt_config.expected/cq_try.json
@@ -100,7 +100,7 @@
"-host",
"https://fuchsia-review.googlesource.com",
"-input",
- "{\"change_id\": \"cobalt_config~123456\", \"params\": {\"o\": [\"ALL_REVISIONS\"]}}",
+ "{\"change_id\": \"cobalt-registry~123456\", \"params\": {\"o\": [\"ALL_REVISIONS\"]}}",
"-output",
"/path/to/tmp/json"
],
@@ -136,7 +136,7 @@
"-time",
"-j=50",
"-name",
- "cobalt_config",
+ "cobalt-registry",
"-remote-branch",
"master",
"config.manifest",
@@ -176,7 +176,7 @@
"-host",
"https://fuchsia-review.googlesource.com",
"-project",
- "cobalt_config",
+ "cobalt-registry",
"-rebase=true",
"refs/changes/00/100/7"
],
@@ -272,7 +272,7 @@
"-j=50",
"-json-output",
"/path/to/tmp/json",
- "cobalt_config"
+ "cobalt-registry"
],
"infra_step": true,
"name": "jiri project",
@@ -283,9 +283,9 @@
"@@@STEP_LOG_LINE@json.output@ \"(HEAD detached at c22471f)\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
"@@@STEP_LOG_LINE@json.output@ \"current_branch\": \"\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"cobalt_config\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/to/cobalt_config\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"remote\": \"https://fuchsia.googlesource.com/cobalt_config\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"cobalt-registry\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/to/cobalt-registry\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"remote\": \"https://fuchsia.googlesource.com/cobalt-registry\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@]@@@",
@@ -300,7 +300,7 @@
"./cobaltb.py",
"setup"
],
- "cwd": "[START_DIR]/cobalt",
+ "cwd": "[START_DIR]/third_party/cobalt",
"name": "setup"
},
{
@@ -312,7 +312,7 @@
"--out_dir",
"[START_DIR]/tools"
],
- "cwd": "[START_DIR]/cobalt",
+ "cwd": "[START_DIR]/third_party/cobalt",
"name": "build"
},
{
@@ -321,7 +321,7 @@
"--output_file",
"[START_DIR]/new_config",
"--config_dir",
- "[START_DIR]/config"
+ "[START_DIR]/third_party/cobalt_config"
],
"name": "check config"
},
@@ -331,7 +331,7 @@
"checkout",
"HEAD^"
],
- "cwd": "[START_DIR]/config",
+ "cwd": "[START_DIR]/third_party/cobalt_config",
"name": "checkout parent"
},
{
@@ -340,7 +340,7 @@
"--output_file",
"[START_DIR]/old_config",
"--config_dir",
- "[START_DIR]/config"
+ "[START_DIR]/third_party/cobalt_config"
],
"name": "check parent config"
},
@@ -350,7 +350,7 @@
"checkout",
"-"
],
- "cwd": "[START_DIR]/config",
+ "cwd": "[START_DIR]/third_party/cobalt_config",
"name": "checkout head"
},
{
@@ -360,7 +360,7 @@
"-s",
"--format=%b"
],
- "cwd": "[START_DIR]/config",
+ "cwd": "[START_DIR]/third_party/cobalt_config",
"name": "read commit message"
},
{
diff --git a/recipes/cobalt_config.py b/recipes/cobalt_config.py
index 6b478dc..ddf77e9 100644
--- a/recipes/cobalt_config.py
+++ b/recipes/cobalt_config.py
@@ -30,7 +30,7 @@
}
# The name of the gerrit project tested by this recipe.
-MANIFEST_PROJECT_NAME = 'cobalt_config'
+MANIFEST_PROJECT_NAME = 'cobalt-registry'
def RunSteps(api, remote, manifest):
@@ -51,7 +51,7 @@
api.step.active_result.presentation.properties['got_revision'] = revision
# Root of the cobalt repo as checked out by the manifest.
- cobalt_src_dir = api.path['start_dir'].join('cobalt')
+ cobalt_src_dir = api.path['start_dir'].join('third_party/cobalt')
tools_dir = api.path['start_dir'].join('tools')
# Build config_parser.
@@ -63,7 +63,7 @@
config_validator_bin = tools_dir.join('config_change_validator')
# Root of the config repo as checked out by the manifest.
- config_src_dir = api.path['start_dir'].join('config')
+ config_src_dir = api.path['start_dir'].join('third_party/cobalt_config')
# Run config_parser on the config repo checkout.
api.step('check config', [
@@ -105,16 +105,16 @@
def GenTests(api):
yield (api.test('ci') + api.buildbucket.ci_build(
- git_repo='https://fuchsia.googlesource.com/cobalt_config',) +
+ git_repo='https://fuchsia.googlesource.com/cobalt-registry',) +
api.properties(
remote='https://fuchsia.googlesource.com/manifest',
manifest='config.manifest',
- project='cobalt_config',
+ project='cobalt-registry',
))
yield (api.test('cq_try') + api.buildbucket.try_build(
- git_repo='https://fuchsia.googlesource.com/cobalt_config',) +
+ git_repo='https://fuchsia.googlesource.com/cobalt-registry',) +
api.properties.tryserver(
remote='https://fuchsia.googlesource.com/manifest',
manifest='config.manifest',
- project='cobalt_config',
+ project='cobalt-registry',
))
