From 0e4f7b4a4b328d1d62c9c5e6a57e58c89a0e9aa2 Mon Sep 17 00:00:00 2001
From: James Monteath <james@blender.org>
Date: Mon, 2 Aug 2021 16:57:29 +0200
Subject: [PATCH] Delete pipeline_config.json file. The yaml file is now used.
 Update README.md.

---
 build_files/config/README.md            | 11 ++--
 build_files/config/pipeline_config.json | 87 -------------------------
 2 files changed, 5 insertions(+), 93 deletions(-)
 delete mode 100644 build_files/config/pipeline_config.json

diff --git a/build_files/config/README.md b/build_files/config/README.md
index 6ce601104af..efa3d4524ec 100644
--- a/build_files/config/README.md
+++ b/build_files/config/README.md
@@ -1,11 +1,10 @@
 Pipeline Config
 ===============
 
-This configuration file is used by buildbot new build pipeline for the `update-code` step.
+The `yaml` configuration file is used by buildbot build pipeline `update-code` step.
 
-It will also be used by the `../utils/make_update.py` script in the near future.
+The file allows to set branches or specific commits for both git submodules and svn artifacts. Can also define various build package versions for use by build workers. Especially useful in experimental and release branches. 
 
-NOTES:
-* Keep both `yaml` and `json` files in sync until deployment of build pipeline updates.
-* The `json` file  be removed once all branches are running with the `yaml` file.
-* Expected buildbot pipeline update is *Friday, July 30th* or *Monday August, 2nd*.
+NOTE:
+* The configuration file is ```NOT``` used by the `../utils/make_update.py` script.
+* That will implemented in the future.
diff --git a/build_files/config/pipeline_config.json b/build_files/config/pipeline_config.json
deleted file mode 100644
index d914cf85eae..00000000000
--- a/build_files/config/pipeline_config.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-    "update-code":
-    {
-        "git" :
-        {
-            "submodules":
-            [
-                { "path": "release/scripts/addons", "branch": "master", "commit_id": "HEAD" },
-                { "path": "release/scripts/addons_contrib", "branch": "master", "commit_id": "HEAD" },
-                { "path": "release/datafiles/locale", "branch": "master", "commit_id": "HEAD" },
-                { "path": "source/tools", "branch": "master", "commit_id": "HEAD" }
-            ]
-        },
-        "svn":
-        {
-            "tests": { "path": "lib/tests", "branch": "trunk", "commit_id": "HEAD" },
-            "libraries":
-            {
-                "darwin-x86_64": { "path": "lib/darwin", "branch": "trunk", "commit_id": "HEAD" },
-                "darwin-arm64": { "path": "lib/darwin_arm64", "branch": "trunk", "commit_id": "HEAD" },
-                "linux-x86_64": { "path": "lib/linux_centos7_x86_64", "branch": "trunk", "commit_id": "HEAD" },
-                "windows-amd64": { "path": "lib/win64_vc15", "branch": "trunk", "commit_id": "HEAD" }
-            }
-        }
-    },
-    "buildbot":
-    {
-        "gcc":
-        {
-            "version": "9.0"
-        },
-        "sdks":
-        {
-            "optix":
-            {
-                "version": "7.1.0"
-            },
-            "cuda10":
-            {
-                "version": "10.1"
-            },
-            "cuda11":
-            {
-                "version": "11.4"
-            }
-        },
-        "cmake":
-        {
-            "default":
-            {
-                "version": "any",
-                "overrides":
-                {
-
-                }
-            },
-            "darwin-x86_64":
-            {
-                "overrides":
-                {
-
-                }
-            },
-            "darwin-arm64":
-            {
-                "overrides":
-                {
-
-                }
-            },
-            "linux-x86_64":
-            {
-                "overrides":
-                {
-
-                }
-            },
-            "windows-amd64":
-            {
-                "overrides":
-                {
-
-                }
-            }
-        }
-    }
-}