Skip to content

C
Chromium_Depot_tools
Commit 85b6d185 authored by Robert Iannucci's avatar Robert Iannucci Committed by Commit Bot
Browse files
Options

[recipe_modules/cipd] Refactor creation methods. 

This clarifies what the 'create' method actually expects,
and adds a nicer approach for recipes that want to synthesize
their own package definition files.

BUG=

Change-Id: Iee5d5c02260bf71d4775ddfc1d4d1ae43937b693
Reviewed-on: https://chromium-review.googlesource.com/440385
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: 's avatarVadim Shtayura <vadimsh@chromium.org>
parent 96dc085d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1645 additions and 65 deletions
recipe_modules/cipd/api.py
View file @ 85b6d185
This diff is collapsed.
recipe_modules/cipd/example.expected/basic.json
View file @ 85b6d185
......@@ -302,8 +302,14 @@
],
"name": "create fake-package.yaml",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
"@@@STEP_LOG_END@json.output (invalid)@@@"
"@@@STEP_TEXT@</br>pkg: fake-package.yaml</br>id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"fake-package.yaml\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
......
recipe_modules/cipd/example.expected/basic_pkg.json 0 → 100644
View file @ 85b6d185
This diff is collapsed.
recipe_modules/cipd/example.expected/describe-many-instances.json
View file @ 85b6d185
......@@ -302,8 +302,14 @@
],
"name": "create fake-package.yaml",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
"@@@STEP_LOG_END@json.output (invalid)@@@"
"@@@STEP_TEXT@</br>pkg: fake-package.yaml</br>id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"fake-package.yaml\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
......
recipe_modules/cipd/example.expected/mac64.json
View file @ 85b6d185
......@@ -302,8 +302,14 @@
],
"name": "create fake-package.yaml",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
"@@@STEP_LOG_END@json.output (invalid)@@@"
"@@@STEP_TEXT@</br>pkg: fake-package.yaml</br>id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"fake-package.yaml\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
......
recipe_modules/cipd/example.expected/pkg_bad_file.json 0 → 100644
View file @ 85b6d185
This diff is collapsed.
recipe_modules/cipd/example.expected/pkg_bad_mode.json 0 → 100644
View file @ 85b6d185
This diff is collapsed.
recipe_modules/cipd/example.expected/pkg_bad_verfile.json 0 → 100644
View file @ 85b6d185
This diff is collapsed.
recipe_modules/cipd/example.expected/win64.json
View file @ 85b6d185
[
{
"cmd": [
"cipd",
"cipd.bat",
"ensure",
"-root",
"[START_DIR]\\packages",
......@@ -27,7 +27,7 @@
},
{
"cmd": [
"cipd",
"cipd.bat",
"search",
"public/package/windows-amd64",
"-tag",
......@@ -52,7 +52,7 @@
},
{
"cmd": [
"cipd",
"cipd.bat",
"describe",
"public/package/windows-amd64",
"-version",
......@@ -103,7 +103,7 @@
},
{
"cmd": [
"cipd",
"cipd.bat",
"ensure",
"-root",
"[START_DIR]\\packages",
......@@ -133,7 +133,7 @@
},
{
"cmd": [
"cipd",
"cipd.bat",
"search",
"private/package/windows-amd64",
"-tag",
......@@ -158,7 +158,7 @@
},
{
"cmd": [
"cipd",
"cipd.bat",
"describe",
"private/package/windows-amd64",
"-version",
......@@ -204,7 +204,7 @@
},
{
"cmd": [
"cipd",
"cipd.bat",
"pkg-build",
"-in",
"fake-input-dir",
......@@ -228,7 +228,7 @@
},
{
"cmd": [
"cipd",
"cipd.bat",
"pkg-build",
"-in",
"fake-input-dir",
......@@ -254,7 +254,7 @@
},
{
"cmd": [
"cipd",
"cipd.bat",
"pkg-register",
"fake-package-path",
"-json-output",
......@@ -283,7 +283,7 @@
},
{
"cmd": [
"cipd",
"cipd.bat",
"create",
"-pkg-def",
"[START_DIR]\\fake-package.yaml",
......@@ -302,13 +302,19 @@
],
"name": "create fake-package.yaml",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
"@@@STEP_LOG_END@json.output (invalid)@@@"
"@@@STEP_TEXT@</br>pkg: fake-package.yaml</br>id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"fake-package.yaml\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
"cipd",
"cipd.bat",
"set-tag",
"fake-package",
"-version",
......@@ -338,7 +344,7 @@
},
{
"cmd": [
"cipd",
"cipd.bat",
"set-ref",
"fake-package",
"-version",
......@@ -368,7 +374,7 @@
},
{
"cmd": [
"cipd",
"cipd.bat",
"search",
"fake-package/windows-amd64",
"-tag",
......
recipe_modules/cipd/example.py
View file @ 85b6d185
......@@ -2,6 +2,9 @@
# 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 List, Single, ConfigList, ConfigGroup
from recipe_engine.recipe_api import Property
DEPS = [
'recipe_engine/path',
'recipe_engine/platform',
......@@ -10,7 +13,18 @@ DEPS = [
'cipd',
]
def RunSteps(api):
PROPERTIES = {
'use_pkg': Property(default=False, kind=bool),
'pkg_files': Property(default=(), kind=List(str)),
'pkg_dirs': Property(default=(), kind=ConfigList(lambda: ConfigGroup(
path=Single(str),
exclusions=List(str),
))),
'ver_files': Property(default=(), kind=List(str)),
'install_mode': Property(default=None),
}
def RunSteps(api, use_pkg, pkg_files, pkg_dirs, ver_files, install_mode):
# Need to set service account credentials.
api.cipd.set_service_account_credentials(
api.cipd.default_bot_service_account_credentials)
......@@ -49,10 +63,27 @@ def RunSteps(api):
'fake_tag_2': 'fake_value_2'})
# Create (build & register).
api.cipd.create(api.path['start_dir'].join('fake-package.yaml'),
refs=['fake-ref-1', 'fake-ref-2'],
tags={'fake_tag_1': 'fake_value_1',
'fake_tag_2': 'fake_value_2'})
if use_pkg:
root = api.path['start_dir'].join('some_subdir')
pkg = api.cipd.PackageDefinition('infra/fake-package', root, install_mode)
for fullpath in pkg_files:
pkg.add_file(api.path.abs_to_path(fullpath))
for obj in pkg_dirs:
pkg.add_dir(api.path.abs_to_path(obj.get('path', '')),
obj.get('exclusions'))
for pth in ver_files:
pkg.add_version_file(pth)
api.cipd.create_from_pkg(pkg,
refs=['fake-ref-1', 'fake-ref-2'],
tags={'fake_tag_1': 'fake_value_1',
'fake_tag_2': 'fake_value_2'})
else:
api.cipd.create_from_yaml(api.path['start_dir'].join('fake-package.yaml'),
refs=['fake-ref-1', 'fake-ref-2'],
tags={'fake_tag_1': 'fake_value_1',
'fake_tag_2': 'fake_value_2'})
# Set tag or ref of an already existing package.
api.cipd.set_tag('fake-package',
......@@ -67,39 +98,89 @@ def RunSteps(api):
def GenTests(api):
yield (
# This is very common dev workstation, but not all devs are on it.
api.test('basic') +
api.platform('linux', 64)
api.test('basic')
+ api.platform('linux', 64)
)
yield (
api.test('mac64') +
api.platform('mac', 64)
api.test('mac64')
+ api.platform('mac', 64)
)
yield (
api.test('win64') +
api.platform('win', 64)
api.test('win64')
+ api.platform('win', 64)
)
yield (
api.test('describe-failed') +
api.platform('linux', 64) +
api.override_step_data(
api.test('describe-failed')
+ api.platform('linux', 64)
+ api.override_step_data(
'cipd describe public/package/linux-amd64',
api.cipd.example_error(
'package "public/package/linux-amd64-ubuntu14_04" not registered',
)
)
))
)
yield (
api.test('describe-many-instances') +
api.platform('linux', 64) +
api.override_step_data(
api.test('describe-many-instances')
+ api.platform('linux', 64)
+ api.override_step_data(
'cipd search fake-package/linux-amd64 dead:beaf',
api.cipd.example_search(
'public/package/linux-amd64-ubuntu14_04',
instances=3
)
))
)
yield (
api.test('basic_pkg')
+ api.properties(
use_pkg=True,
pkg_files=[
'[START_DIR]/some_subdir/a/path/to/file.py',
'[START_DIR]/some_subdir/some_config.cfg',
],
pkg_dirs=[
{
'path': '[START_DIR]/some_subdir/directory',
},
{
'path': '[START_DIR]/some_subdir/other_dir',
'exclusions': [
r'.*\.pyc',
]
},
],
ver_file=['.versions/file.cipd_version'],
)
)
yield (
api.test('pkg_bad_verfile')
+ api.properties(
use_pkg=True,
ver_files=['a', 'b'],
)
+ api.expect_exception('ValueError')
)
yield (
api.test('pkg_bad_mode')
+ api.properties(
use_pkg=True,
install_mode='',
)
+ api.expect_exception('ValueError')
)
yield (
api.test('pkg_bad_file')
+ api.properties(
use_pkg=True,
pkg_files=[
'[START_DIR]/a/path/to/file.py',
],
)
+ api.expect_exception('ValueError')
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment