Remove jiri module configuration
This configuration was never really used for anything and isn't really
needed since we specify both remote and manifest as bucket properties.
Change-Id: I683d5bf3d59dbb7e5da928db3ae818f0d7adb4a9
diff --git a/recipe_modules/jiri/config.py b/recipe_modules/jiri/config.py
deleted file mode 100644
index a8314e1..0000000
--- a/recipe_modules/jiri/config.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2016 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-from recipe_engine.config import config_item_context, ConfigGroup
-from recipe_engine.config import ConfigList, Dict, Single, Static, Set, List
-
-
-def BaseConfig(**kwargs):
- return ConfigGroup(
- manifests = ConfigList(
- lambda: ConfigGroup(
- manifest = Single(basestring, required=True),
- remote = Single(str, required=True),
- )
- )
- )
-
-
-config_ctx = config_item_context(BaseConfig)
-
-
-@config_ctx()
-def jiri(c):
- m = c.manifests.add()
- m.manifest = 'jiri'
- m.remote = 'https://fuchsia.googlesource.com/manifest'
-
-
-@config_ctx()
-def magenta(c):
- m = c.manifests.add()
- m.manifest = 'magenta'
- m.remote = 'https://fuchsia.googlesource.com/manifest'
-
-
-@config_ctx()
-def fuchsia(c):
- m = c.manifests.add()
- m.manifest = 'fuchsia'
- m.remote = 'https://fuchsia.googlesource.com/manifest'
diff --git a/recipe_modules/jiri/example.expected/basic_fuchsia.json b/recipe_modules/jiri/example.expected/basic_fuchsia.json
deleted file mode 100644
index d2f5242..0000000
--- a/recipe_modules/jiri/example.expected/basic_fuchsia.json
+++ /dev/null
@@ -1,154 +0,0 @@
-[
- {
- "cmd": [],
- "name": "ensure_jiri"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[infra::cipd]/resources/bootstrap.py",
- "--platform",
- "linux-amd64",
- "--dest-directory",
- "[START_DIR]/cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "name": "ensure_jiri.install cipd",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@cipd version: git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": \"git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/cipd",
- "ensure",
- "--root",
- "[START_DIR]/cipd/jiri",
- "--list",
- "fuchsia/tools/jiri/linux-amd64 latest",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "name": "ensure_jiri.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/jiri/linux-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "init",
- "-cache",
- "[CACHE]/jiri",
- "dir"
- ],
- "name": "jiri init"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "import",
- "-overwrite=true",
- "minimal",
- "https://fuchsia.googlesource.com"
- ],
- "name": "jiri import"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "update",
- "-autoupdate=false",
- "-gc=true",
- "snapshot"
- ],
- "name": "jiri update"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "snapshot",
- "/path/to/tmp/"
- ],
- "name": "jiri snapshot",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@jiri.snapshot@@@@",
- "@@@STEP_LOG_LINE@jiri.snapshot@<manifest>@@@",
- "@@@STEP_LOG_LINE@jiri.snapshot@ <projects>@@@",
- "@@@STEP_LOG_LINE@jiri.snapshot@ <project name=\"manifest\" path=\"manifest\" remote=\"https://fuchsia.googlesource.com/manifest\" revision=\"4c2b0da3c06341db5cebe4d02c78c93c3b2bd78b\"/>@@@",
- "@@@STEP_LOG_LINE@jiri.snapshot@ </projects>@@@",
- "@@@STEP_LOG_LINE@jiri.snapshot@</manifest>@@@",
- "@@@STEP_LOG_END@jiri.snapshot@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "project",
- "info",
- "-json-output",
- "/path/to/tmp/json",
- "test"
- ],
- "name": "jiri project info",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"branches\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"(HEAD detached at c22471f)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"master\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"current_branch\": \"\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"test\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"/path/to/repo\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"remote\": \"https://fuchsia.googlesource.com/repo\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "patch",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-delete=true",
- "-force=true",
- "refs/changes/1/2/3"
- ],
- "name": "jiri patch"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "project",
- "clean",
- "-branches=true"
- ],
- "name": "jiri project clean"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/recipe_modules/jiri/example.expected/basic_jiri.json b/recipe_modules/jiri/example.expected/basic_jiri.json
deleted file mode 100644
index d2f5242..0000000
--- a/recipe_modules/jiri/example.expected/basic_jiri.json
+++ /dev/null
@@ -1,154 +0,0 @@
-[
- {
- "cmd": [],
- "name": "ensure_jiri"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[infra::cipd]/resources/bootstrap.py",
- "--platform",
- "linux-amd64",
- "--dest-directory",
- "[START_DIR]/cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "name": "ensure_jiri.install cipd",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@cipd version: git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": \"git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/cipd",
- "ensure",
- "--root",
- "[START_DIR]/cipd/jiri",
- "--list",
- "fuchsia/tools/jiri/linux-amd64 latest",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "name": "ensure_jiri.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/jiri/linux-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "init",
- "-cache",
- "[CACHE]/jiri",
- "dir"
- ],
- "name": "jiri init"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "import",
- "-overwrite=true",
- "minimal",
- "https://fuchsia.googlesource.com"
- ],
- "name": "jiri import"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "update",
- "-autoupdate=false",
- "-gc=true",
- "snapshot"
- ],
- "name": "jiri update"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "snapshot",
- "/path/to/tmp/"
- ],
- "name": "jiri snapshot",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@jiri.snapshot@@@@",
- "@@@STEP_LOG_LINE@jiri.snapshot@<manifest>@@@",
- "@@@STEP_LOG_LINE@jiri.snapshot@ <projects>@@@",
- "@@@STEP_LOG_LINE@jiri.snapshot@ <project name=\"manifest\" path=\"manifest\" remote=\"https://fuchsia.googlesource.com/manifest\" revision=\"4c2b0da3c06341db5cebe4d02c78c93c3b2bd78b\"/>@@@",
- "@@@STEP_LOG_LINE@jiri.snapshot@ </projects>@@@",
- "@@@STEP_LOG_LINE@jiri.snapshot@</manifest>@@@",
- "@@@STEP_LOG_END@jiri.snapshot@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "project",
- "info",
- "-json-output",
- "/path/to/tmp/json",
- "test"
- ],
- "name": "jiri project info",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"branches\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"(HEAD detached at c22471f)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"master\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"current_branch\": \"\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"test\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"/path/to/repo\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"remote\": \"https://fuchsia.googlesource.com/repo\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "patch",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-delete=true",
- "-force=true",
- "refs/changes/1/2/3"
- ],
- "name": "jiri patch"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "project",
- "clean",
- "-branches=true"
- ],
- "name": "jiri project clean"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/recipe_modules/jiri/example.expected/basic_magenta.json b/recipe_modules/jiri/example.expected/basic_magenta.json
deleted file mode 100644
index d2f5242..0000000
--- a/recipe_modules/jiri/example.expected/basic_magenta.json
+++ /dev/null
@@ -1,154 +0,0 @@
-[
- {
- "cmd": [],
- "name": "ensure_jiri"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[infra::cipd]/resources/bootstrap.py",
- "--platform",
- "linux-amd64",
- "--dest-directory",
- "[START_DIR]/cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "name": "ensure_jiri.install cipd",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@cipd version: git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[START_DIR]/cipd/cipd\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": \"git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/cipd",
- "ensure",
- "--root",
- "[START_DIR]/cipd/jiri",
- "--list",
- "fuchsia/tools/jiri/linux-amd64 latest",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "name": "ensure_jiri.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/jiri/linux-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "init",
- "-cache",
- "[CACHE]/jiri",
- "dir"
- ],
- "name": "jiri init"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "import",
- "-overwrite=true",
- "minimal",
- "https://fuchsia.googlesource.com"
- ],
- "name": "jiri import"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "update",
- "-autoupdate=false",
- "-gc=true",
- "snapshot"
- ],
- "name": "jiri update"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "snapshot",
- "/path/to/tmp/"
- ],
- "name": "jiri snapshot",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@jiri.snapshot@@@@",
- "@@@STEP_LOG_LINE@jiri.snapshot@<manifest>@@@",
- "@@@STEP_LOG_LINE@jiri.snapshot@ <projects>@@@",
- "@@@STEP_LOG_LINE@jiri.snapshot@ <project name=\"manifest\" path=\"manifest\" remote=\"https://fuchsia.googlesource.com/manifest\" revision=\"4c2b0da3c06341db5cebe4d02c78c93c3b2bd78b\"/>@@@",
- "@@@STEP_LOG_LINE@jiri.snapshot@ </projects>@@@",
- "@@@STEP_LOG_LINE@jiri.snapshot@</manifest>@@@",
- "@@@STEP_LOG_END@jiri.snapshot@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "project",
- "info",
- "-json-output",
- "/path/to/tmp/json",
- "test"
- ],
- "name": "jiri project info",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"branches\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"(HEAD detached at c22471f)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"master\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"current_branch\": \"\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"test\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"/path/to/repo\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"remote\": \"https://fuchsia.googlesource.com/repo\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "patch",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-delete=true",
- "-force=true",
- "refs/changes/1/2/3"
- ],
- "name": "jiri patch"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/jiri/jiri",
- "project",
- "clean",
- "-branches=true"
- ],
- "name": "jiri project clean"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/recipe_modules/jiri/example.py b/recipe_modules/jiri/example.py
index 94fe0c7..9c6fe50 100644
--- a/recipe_modules/jiri/example.py
+++ b/recipe_modules/jiri/example.py
@@ -14,7 +14,6 @@
def RunSteps(api):
# First, ensure we have jiri.
- api.jiri.set_config(api.properties.get('config'))
api.jiri.ensure_jiri()
assert api.jiri.jiri
@@ -47,8 +46,3 @@
def GenTests(api):
yield api.test('basic')
- for config in ('jiri', 'magenta', 'fuchsia'):
- yield (
- api.test('basic_%s' % config) +
- api.properties(config=config)
- )
