| Index: scripts/slave/recipes/skia/infra.expected/Infra-PerCommit.json
|
| diff --git a/scripts/slave/recipes/skia/infra.expected/Infra-PerCommit.json b/scripts/slave/recipes/skia/infra.expected/Infra-PerCommit.json
|
| index c1f08fed7c22f4e40b417f438f77a3699416357d..617fcd5a61403e10a302e8118692826672313915 100644
|
| --- a/scripts/slave/recipes/skia/infra.expected/Infra-PerCommit.json
|
| +++ b/scripts/slave/recipes/skia/infra.expected/Infra-PerCommit.json
|
| @@ -4,10 +4,9 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[SLAVE_BUILD]/go/src",
|
| + "[CWD]/go/src",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs makedirs go/src",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -30,7 +29,7 @@
|
| "origin",
|
| "https://skia.googlesource.com/buildbot"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
|
| + "cwd": "[CWD]/go/src/go.skia.org/infra",
|
| "name": "git remote"
|
| },
|
| {
|
| @@ -39,7 +38,7 @@
|
| "fetch",
|
| "origin"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
|
| + "cwd": "[CWD]/go/src/go.skia.org/infra",
|
| "name": "git fetch"
|
| },
|
| {
|
| @@ -49,7 +48,7 @@
|
| "-d",
|
| "-f"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
|
| + "cwd": "[CWD]/go/src/go.skia.org/infra",
|
| "name": "git clean"
|
| },
|
| {
|
| @@ -59,7 +58,7 @@
|
| "--hard",
|
| "origin/master"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
|
| + "cwd": "[CWD]/go/src/go.skia.org/infra",
|
| "name": "git reset"
|
| },
|
| {
|
| @@ -69,11 +68,11 @@
|
| "-u",
|
| "./..."
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
|
| + "cwd": "[CWD]/go/src/go.skia.org/infra",
|
| "env": {
|
| "GIT_USER_AGENT": "git/1.9.1",
|
| - "GOPATH": "[SLAVE_BUILD]/go",
|
| - "PATH": "[SLAVE_BUILD]/go/bin:%(PATH)s"
|
| + "GOPATH": "[CWD]/go",
|
| + "PATH": "[CWD]/go/bin:%(PATH)s"
|
| },
|
| "name": "update_deps"
|
| },
|
| @@ -85,7 +84,7 @@
|
| "origin",
|
| "https://skia.googlesource.com/buildbot"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
|
| + "cwd": "[CWD]/go/src/go.skia.org/infra",
|
| "name": "git remote (2)"
|
| },
|
| {
|
| @@ -94,7 +93,7 @@
|
| "fetch",
|
| "origin"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
|
| + "cwd": "[CWD]/go/src/go.skia.org/infra",
|
| "name": "git fetch (2)"
|
| },
|
| {
|
| @@ -104,7 +103,7 @@
|
| "-d",
|
| "-f"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
|
| + "cwd": "[CWD]/go/src/go.skia.org/infra",
|
| "name": "git clean (2)"
|
| },
|
| {
|
| @@ -114,7 +113,7 @@
|
| "--hard",
|
| "origin/master"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
|
| + "cwd": "[CWD]/go/src/go.skia.org/infra",
|
| "name": "git reset (2)"
|
| },
|
| {
|
| @@ -123,7 +122,7 @@
|
| "rev-parse",
|
| "HEAD"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
|
| + "cwd": "[CWD]/go/src/go.skia.org/infra",
|
| "name": "git rev-parse",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -136,11 +135,11 @@
|
| "get",
|
| "golang.org/x/tools/cmd/goimports"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
|
| + "cwd": "[CWD]/go/src/go.skia.org/infra",
|
| "env": {
|
| "GIT_USER_AGENT": "git/1.9.1",
|
| - "GOPATH": "[SLAVE_BUILD]/go",
|
| - "PATH": "[SLAVE_BUILD]/go/bin:%(PATH)s"
|
| + "GOPATH": "[CWD]/go",
|
| + "PATH": "[CWD]/go/bin:%(PATH)s"
|
| },
|
| "name": "install goimports"
|
| },
|
| @@ -150,11 +149,11 @@
|
| "get",
|
| "github.com/kisielk/errcheck"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
|
| + "cwd": "[CWD]/go/src/go.skia.org/infra",
|
| "env": {
|
| "GIT_USER_AGENT": "git/1.9.1",
|
| - "GOPATH": "[SLAVE_BUILD]/go",
|
| - "PATH": "[SLAVE_BUILD]/go/bin:%(PATH)s"
|
| + "GOPATH": "[CWD]/go",
|
| + "PATH": "[CWD]/go/bin:%(PATH)s"
|
| },
|
| "name": "install errcheck"
|
| },
|
| @@ -162,11 +161,11 @@
|
| "cmd": [
|
| "./setup_test_db"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra/go/database",
|
| + "cwd": "[CWD]/go/src/go.skia.org/infra/go/database",
|
| "env": {
|
| "GIT_USER_AGENT": "git/1.9.1",
|
| - "GOPATH": "[SLAVE_BUILD]/go",
|
| - "PATH": "[SLAVE_BUILD]/go/bin:%(PATH)s"
|
| + "GOPATH": "[CWD]/go",
|
| + "PATH": "[CWD]/go/bin:%(PATH)s"
|
| },
|
| "name": "setup database"
|
| },
|
| @@ -176,12 +175,12 @@
|
| "-u",
|
| "run_unittests"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
|
| + "cwd": "[CWD]/go/src/go.skia.org/infra",
|
| "env": {
|
| "GIT_USER_AGENT": "git/1.9.1",
|
| - "GOPATH": "[SLAVE_BUILD]/go",
|
| + "GOPATH": "[CWD]/go",
|
| "KARMA_PORT": "15001",
|
| - "PATH": "[SLAVE_BUILD]/go/bin:%(PATH)s"
|
| + "PATH": "[CWD]/go/bin:%(PATH)s"
|
| },
|
| "name": "run_unittests"
|
| },
|
|
|