| Index: scripts/slave/recipes/infra/build_conda_cipd_pkg.expected/mac.json
|
| diff --git a/scripts/slave/recipes/infra/build_conda_cipd_pkg.expected/mac.json b/scripts/slave/recipes/infra/build_conda_cipd_pkg.expected/mac.json
|
| deleted file mode 100644
|
| index 3522cd71a444b9218b7c42c36a69d5e32750f440..0000000000000000000000000000000000000000
|
| --- a/scripts/slave/recipes/infra/build_conda_cipd_pkg.expected/mac.json
|
| +++ /dev/null
|
| @@ -1,240 +0,0 @@
|
| -[
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[build::cipd]/resources/bootstrap.py",
|
| - "--platform",
|
| - "mac-amd64",
|
| - "--dest-directory",
|
| - "[SLAVE_BUILD]/cipd",
|
| - "--json-output",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "name": "install cipd",
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[SLAVE_BUILD]/conda_staging_dir"
|
| - ],
|
| - "name": "rmtree cleaning staging dir",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/tools/pycurl.py",
|
| - "https://repo.continuum.io/miniconda/Miniconda2-3.18.3-MacOSX-x86_64.sh",
|
| - "--outfile",
|
| - "[TMP_BASE]/conda_tmp_1/Miniconda2-3.18.3-MacOSX-x86_64.sh",
|
| - "--attempts",
|
| - "5"
|
| - ],
|
| - "name": "fetch miniconda installer"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "/bin/bash",
|
| - "[TMP_BASE]/conda_tmp_1/Miniconda2-3.18.3-MacOSX-x86_64.sh",
|
| - "-b",
|
| - "-p",
|
| - "[SLAVE_BUILD]/conda_staging_dir"
|
| - ],
|
| - "env": {
|
| - "PYTHONPATH": ""
|
| - },
|
| - "name": "install miniconda"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[TMP_BASE]/conda_tmp_1"
|
| - ],
|
| - "name": "rmtree remove miniconda installer",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "[SLAVE_BUILD]/conda_staging_dir/bin/conda",
|
| - "install",
|
| - "matplotlib",
|
| - "--yes"
|
| - ],
|
| - "env": {
|
| - "PYTHONPATH": null
|
| - },
|
| - "name": "conda install matplotlib"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "[SLAVE_BUILD]/conda_staging_dir/bin/conda",
|
| - "install",
|
| - "numpy",
|
| - "--yes"
|
| - ],
|
| - "env": {
|
| - "PYTHONPATH": null
|
| - },
|
| - "name": "conda install numpy"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "[SLAVE_BUILD]/conda_staging_dir/bin/conda",
|
| - "install",
|
| - "scipy",
|
| - "--yes"
|
| - ],
|
| - "env": {
|
| - "PYTHONPATH": null
|
| - },
|
| - "name": "conda install scipy"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "[SLAVE_BUILD]/conda_staging_dir/bin/conda",
|
| - "clean",
|
| - "--tarballs",
|
| - "--index-cache",
|
| - "--packages",
|
| - "--yes"
|
| - ],
|
| - "env": {
|
| - "PYTHONPATH": null
|
| - },
|
| - "name": "conda clean --tarballs --index-cache --packages"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[build::conda]/resources/butcher_conda.py",
|
| - "[SLAVE_BUILD]/conda_staging_dir"
|
| - ],
|
| - "name": "make conda env location independent"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "[SLAVE_BUILD]/cipd/cipd",
|
| - "pkg-build",
|
| - "--in",
|
| - "[SLAVE_BUILD]/conda_staging_dir",
|
| - "--name",
|
| - "infra/conda_python/scientific/mac-amd64",
|
| - "--out",
|
| - "[SLAVE_BUILD]/conda_python.cipd",
|
| - "--json-output",
|
| - "/path/to/tmp/json",
|
| - "--install-mode",
|
| - "copy"
|
| - ],
|
| - "name": "build mac-amd64",
|
| - "~followup_annotations": [
|
| - "@@@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\": \"infra/conda_python/scientific/mac-amd64\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "[SLAVE_BUILD]/cipd/cipd",
|
| - "pkg-register",
|
| - "[SLAVE_BUILD]/conda_python.cipd",
|
| - "--json-output",
|
| - "/path/to/tmp/json",
|
| - "--service-account-json",
|
| - "/creds/service_accounts/service-account-cipd-builder.json",
|
| - "--ref",
|
| - "latest",
|
| - "--tag",
|
| - "buildbot_build:chromium.testing.master/TestBuilder/571",
|
| - "--tag",
|
| - "conda:Miniconda2-3-18-3"
|
| - ],
|
| - "name": "register infra/conda_python/scientific/mac-amd64",
|
| - "~followup_annotations": [
|
| - "@@@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\": \"infra/conda_python/scientific/mac-amd64\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
|
| - "[SLAVE_BUILD]/conda_python.cipd"
|
| - ],
|
| - "name": "remove *.cipd file",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import os@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[SLAVE_BUILD]/conda_staging_dir"
|
| - ],
|
| - "name": "rmtree removing conda",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "name": "$result",
|
| - "recipe_result": null,
|
| - "status_code": 0
|
| - }
|
| -]
|
|
|