From 66db75da67fb4c75207c2e495765e1e74584e3b1 Mon Sep 17 00:00:00 2001
From: Eric Boren <borenet@google.com>
Date: Thu, 7 Dec 2017 09:21:07 -0500
Subject: [infra] Move commands from isolates to gen_tasks.go

This has the side effect of bundling recipes for all tasks,
which will be required anyway to run recipes in the future.

Bug: skia:7050
Change-Id: Ia30a95c750f2a237a8bf60263b2981682673c043
Reviewed-on: https://skia-review.googlesource.com/81300
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
---
 .../bundle_recipes.expected/BundleRecipes.json     | 61 ----------------------
 infra/bots/recipes/bundle_recipes.py               | 40 --------------
 2 files changed, 101 deletions(-)
 delete mode 100644 infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json
 delete mode 100644 infra/bots/recipes/bundle_recipes.py

(limited to 'infra/bots/recipes')

diff --git a/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json b/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json
deleted file mode 100644
index 1cf232b276..0000000000
--- a/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json
+++ /dev/null
@@ -1,61 +0,0 @@
-[
-  {
-    "cmd": [
-      "git",
-      "init"
-    ],
-    "cwd": "[START_DIR]/skia",
-    "env": {
-      "PATH": "[START_DIR]/git:[START_DIR]/git/bin:<PATH>"
-    },
-    "infra_step": true,
-    "name": "git init"
-  },
-  {
-    "cmd": [
-      "git",
-      "add",
-      "."
-    ],
-    "cwd": "[START_DIR]/skia",
-    "env": {
-      "PATH": "[START_DIR]/git:[START_DIR]/git/bin:<PATH>"
-    },
-    "infra_step": true,
-    "name": "git add"
-  },
-  {
-    "cmd": [
-      "git",
-      "commit",
-      "-m",
-      "commit recipes"
-    ],
-    "cwd": "[START_DIR]/skia",
-    "env": {
-      "PATH": "[START_DIR]/git:[START_DIR]/git/bin:<PATH>"
-    },
-    "infra_step": true,
-    "name": "git commit"
-  },
-  {
-    "cmd": [
-      "python",
-      "[START_DIR]/skia/infra/bots/recipes.py",
-      "bundle",
-      "--destination",
-      "[SWARM_OUT_DIR]/recipe_bundle"
-    ],
-    "cwd": "[START_DIR]/skia",
-    "env": {
-      "PATH": "[START_DIR]/git:[START_DIR]/git/bin:<PATH>"
-    },
-    "infra_step": true,
-    "name": "Bundle Recipes"
-  },
-  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
-  }
-]
\ No newline at end of file
diff --git a/infra/bots/recipes/bundle_recipes.py b/infra/bots/recipes/bundle_recipes.py
deleted file mode 100644
index 49310af55a..0000000000
--- a/infra/bots/recipes/bundle_recipes.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-
-# Recipe module for Skia Swarming compile.
-
-
-DEPS = [
-  'git',
-  'recipe_engine/context',
-  'recipe_engine/path',
-  'recipe_engine/properties',
-  'recipe_engine/step',
-]
-
-
-def RunSteps(api):
-  bundle_dir = api.properties['swarm_out_dir'] + '/recipe_bundle'
-  skia_dir = api.path['start_dir'].join('skia')
-  recipes_py = api.path['start_dir'].join('skia', 'infra', 'bots', 'recipes.py')
-  with api.git.env():
-    with api.context(cwd=skia_dir):
-      api.step('git init', infra_step=True,
-               cmd=['git', 'init'])
-      api.step('git add', infra_step=True,
-               cmd=['git', 'add', '.'])
-      api.step('git commit', infra_step=True,
-               cmd=['git', 'commit', '-m', 'commit recipes'])
-      api.step('Bundle Recipes', infra_step=True,
-               cmd=['python', recipes_py, 'bundle',
-                    '--destination', bundle_dir])
-
-
-def GenTests(api):
-  yield (
-    api.test('BundleRecipes') +
-    api.properties(buildername='Housekeeper-PerCommit-BundleRecipes',
-                   swarm_out_dir='[SWARM_OUT_DIR]')
-  )
-- 
cgit v1.2.3