commit 8b9b60cd6fe82829547784a0b5470781d15d8575
author YoungSeok Yoon <youngseokyoon@google.com> Fri Apr 14 16:24:27 2017 -0700
committer YoungSeok Yoon <youngseokyoon@google.com> Fri Apr 14 16:34:12 2017 -0700
tree 122edc4636d75947f01adffa1b856a415c539e4a
parent 9a09c547b93358bb64bdcbd590e3cb5d536a7738

Fix the modules recipe to use the patch_project property

Change-Id: I2cfd80e98df888765718799c9f5fc0df14effab1

recipes/modules.expected/basic.json

diff --git a/recipes/modules.expected/basic.json b/recipes/modules.expected/basic.json
index a2b818a..e68b319 100644
--- a/recipes/modules.expected/basic.json
+++ b/recipes/modules.expected/basic.json
@@ -108,7 +108,7 @@
       "project",
       "-json-output",
       "/path/to/tmp/json",
-      "modules"
+      "modules/common"
     ],
     "infra_step": true,
     "name": "jiri project",
@@ -120,7 +120,7 @@
       "@@@STEP_LOG_LINE@json.output@      \"master\"@@@",
       "@@@STEP_LOG_LINE@json.output@    ], @@@",
       "@@@STEP_LOG_LINE@json.output@    \"current_branch\": \"\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"modules\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"name\": \"modules/common\", @@@",
       "@@@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\"@@@",

recipes/modules.expected/cq.json

diff --git a/recipes/modules.expected/cq.json b/recipes/modules.expected/cq.json
index 2b33cdb..96f651d 100644
--- a/recipes/modules.expected/cq.json
+++ b/recipes/modules.expected/cq.json
@@ -108,7 +108,7 @@
       "project",
       "-json-output",
       "/path/to/tmp/json",
-      "modules"
+      "modules/common"
     ],
     "infra_step": true,
     "name": "jiri project",
@@ -120,7 +120,7 @@
       "@@@STEP_LOG_LINE@json.output@      \"master\"@@@",
       "@@@STEP_LOG_LINE@json.output@    ], @@@",
       "@@@STEP_LOG_LINE@json.output@    \"current_branch\": \"\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"modules\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"name\": \"modules/common\", @@@",
       "@@@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\"@@@",
@@ -179,7 +179,7 @@
       "make",
       "presubmit-cq"
     ],
-    "cwd": "[START_DIR]/apps/modules",
+    "cwd": "[START_DIR]/apps/modules/common",
     "env": {
       "GOMA": "1",
       "GOMA_DIR": "[START_DIR]/cipd/goma",

recipes/modules.py

diff --git a/recipes/modules.py b/recipes/modules.py
index a4bd71e..b772477 100644
--- a/recipes/modules.py
+++ b/recipes/modules.py
@@ -44,7 +44,7 @@
                              'https://fuchsia.googlesource.com/manifest')
     api.jiri.clean()
     update_result = api.jiri.update()
-    revision = api.jiri.project('modules').json.output[0]['revision']
+    revision = api.jiri.project(patch_project).json.output[0]['revision']
     api.step.active_result.presentation.properties['got_revision'] = revision
 
     step_result = api.jiri.snapshot(api.raw_io.output())
@@ -75,9 +75,11 @@
 
 
 def GenTests(api):
-  yield api.test('basic')
+  yield api.test('basic') + api.properties(
+      patch_project='modules/common',
+  )
   yield api.test('cq') + api.properties.tryserver(
-      gerrit_project='modules',
+      gerrit_project='modules/common',
       patch_gerrit_url='fuchsia-review.googlesource.com',
-      project_path='apps/modules',
+      project_path='apps/modules/common',
   )