diff options
-rw-r--r-- | SKP_VERSION | 1 | ||||
-rwxr-xr-x | bin/fetch-skps | 22 | ||||
-rw-r--r-- | infra/bots/assets/skp/VERSION | 1 | ||||
-rwxr-xr-x | infra/bots/assets/skp/create.py | 9 | ||||
-rw-r--r-- | infra/bots/perf_skia.isolate | 6 | ||||
-rw-r--r-- | infra/bots/skps.isolate | 8 | ||||
-rw-r--r-- | infra/bots/test_skia.isolate | 6 | ||||
-rw-r--r-- | site/dev/testing/skps.md | 13 |
8 files changed, 24 insertions, 42 deletions
diff --git a/SKP_VERSION b/SKP_VERSION deleted file mode 100644 index 3e90fddaba..0000000000 --- a/SKP_VERSION +++ /dev/null @@ -1 +0,0 @@ -833
\ No newline at end of file diff --git a/bin/fetch-skps b/bin/fetch-skps index bac8e2004a..19f46e33c4 100755 --- a/bin/fetch-skps +++ b/bin/fetch-skps @@ -5,23 +5,5 @@ set -x set -e -VERSION=`cat $(dirname $0)/../SKP_VERSION` -if ! gsutil -m cp -r gs://chromium-skia-gm/playback_$VERSION/skps . ; then - cat >&2 <<EOF - - Instructions for authenticating. - - Install the utilities you need: - curl https://sdk.cloud.google.com | bash - - Authenticate - gcloud auth login - - Follow instructions on web page. - - Set Project - gcloud config set project google.com:skia-buildbots - -EOF -exit 1 -fi +DOWNLOAD_SCRIPT=$(cd $(dirname $0)/..; pwd)/infra/bots/assets/skp/download.py +python ${DOWNLOAD_SCRIPT} -t $(pwd)/skps diff --git a/infra/bots/assets/skp/VERSION b/infra/bots/assets/skp/VERSION new file mode 100644 index 0000000000..56a6051ca2 --- /dev/null +++ b/infra/bots/assets/skp/VERSION @@ -0,0 +1 @@ +1
\ No newline at end of file diff --git a/infra/bots/assets/skp/create.py b/infra/bots/assets/skp/create.py index 68df7f07c2..6bf716c532 100755 --- a/infra/bots/assets/skp/create.py +++ b/infra/bots/assets/skp/create.py @@ -20,7 +20,8 @@ import utils SKIA_TOOLS = os.path.join(common.INFRA_BOTS_DIR, os.pardir, os.pardir, 'tools') -def create_asset(chrome_src_path, browser_executable, target_dir): +def create_asset(chrome_src_path, browser_executable, target_dir, + upload_to_partner_bucket): """Create the asset.""" browser_executable = os.path.realpath(browser_executable) chrome_src_path = os.path.realpath(chrome_src_path) @@ -47,6 +48,8 @@ def create_asset(chrome_src_path, browser_executable, target_dir): '--output_dir', os.getcwd(), '--chrome_src_path', chrome_src_path, ] + if upload_to_partner_bucket: + webpages_playback_cmd.append('--upload_to_partner_bucket') try: subprocess.check_call(webpages_playback_cmd) finally: @@ -75,8 +78,10 @@ def main(): parser.add_argument('--target_dir', '-t', required=True) parser.add_argument('--chrome_src_path', '-c', required=True) parser.add_argument('--browser_executable', '-e', required=True) + parser.add_argument('--upload_to_partner_bucket', action='store_true') args = parser.parse_args() - create_asset(args.chrome_src_path, args.browser_executable, args.target_dir) + create_asset(args.chrome_src_path, args.browser_executable, args.target_dir, + args.upload_to_partner_bucket) if __name__ == '__main__': diff --git a/infra/bots/perf_skia.isolate b/infra/bots/perf_skia.isolate index 8e38791ebf..e43e843938 100644 --- a/infra/bots/perf_skia.isolate +++ b/infra/bots/perf_skia.isolate @@ -4,6 +4,10 @@ 'infrabots.isolate', 'ios_bin.isolate', 'resources.isolate', - 'skps.isolate', ], + 'variables': { + 'files': [ + '../../../.gclient', + ], + }, } diff --git a/infra/bots/skps.isolate b/infra/bots/skps.isolate deleted file mode 100644 index 84e986f4be..0000000000 --- a/infra/bots/skps.isolate +++ /dev/null @@ -1,8 +0,0 @@ -{ - 'variables': { - 'files': [ - '../../../skps/', - '../../../tmp/SKP_VERSION', - ], - }, -} diff --git a/infra/bots/test_skia.isolate b/infra/bots/test_skia.isolate index 8e38791ebf..e43e843938 100644 --- a/infra/bots/test_skia.isolate +++ b/infra/bots/test_skia.isolate @@ -4,6 +4,10 @@ 'infrabots.isolate', 'ios_bin.isolate', 'resources.isolate', - 'skps.isolate', ], + 'variables': { + 'files': [ + '../../../.gclient', + ], + }, } diff --git a/site/dev/testing/skps.md b/site/dev/testing/skps.md index 63afb67a7e..716f1c68d8 100644 --- a/site/dev/testing/skps.md +++ b/site/dev/testing/skps.md @@ -31,16 +31,11 @@ How to download SKPs The following will work only if you have a google.com account. -All buildbot SKP files created by the RecreateSKPs bot are available in the Google Storage bucket gs://chromium-skia-gm, they can be copied over to your local directory like this: +All buildbot SKP files created by the RecreateSKPs bot are available via the asset management scripts: -* Download the gsutil tool https://developers.google.com/cloud/sdk/#Quick_Start. -* Authenticate using your google.com credentials “gcloud auth login” -* Get the current SKP version from https://skia.googlesource.com/skia/+/master/SKP_VERSION. -* Run in your terminal: - - $ SKP\_VERSION=...<br/> - $ SKP\_DEST=...<br/> - $ gsutil -m cp gs://chromium-skia-gm/playback\_${SKP\_VERSION}/skps/*.skp ${SKP\_DEST} + $ download_from_google_storage -s infra/bots/tools/luci-go/${PLATFORM}/cipd.sha1 --bucket chromium-luci + $ infra/bots/tools/luci-go/${PLATFORM}/cipd auth-login + $ infra/bots/assets/skp/download.py -t ${TARGET_DIR} <a name="buildbot_skps_partners"></a> |