From a7056c1cefd8a38ef47f8bd90d51a4a1d395e0a9 Mon Sep 17 00:00:00 2001 From: Chunyi Lyu Date: Fri, 19 May 2017 14:44:39 -0700 Subject: [PATCH 1/5] Remove dea-hm-workspace submodule and all its related packages [#145311887] Signed-off-by: Steve Taylor --- .gitmodules | 3 --- packages/dea_logging_agent | 1 - packages/dea_next | 1 - packages/hm9000 | 1 - packages/warden | 1 - src/dea_next | 1 - src/hm9000 | 1 - src/warden | 1 - 8 files changed, 10 deletions(-) delete mode 120000 packages/dea_logging_agent delete mode 120000 packages/dea_next delete mode 120000 packages/hm9000 delete mode 120000 packages/warden delete mode 120000 src/dea_next delete mode 120000 src/hm9000 delete mode 120000 src/warden diff --git a/.gitmodules b/.gitmodules index f94ce9e359..aa4929027c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,9 +19,6 @@ [submodule "src/uaa-release"] path = src/uaa-release url = https://github.com/cloudfoundry/uaa-release -[submodule "src/dea-hm-workspace"] - path = src/dea-hm-workspace - url = https://github.com/cloudfoundry/dea-hm-workspace [submodule "src/capi-release"] path = src/capi-release url = https://github.com/cloudfoundry/capi-release diff --git a/packages/dea_logging_agent b/packages/dea_logging_agent deleted file mode 120000 index 8c0e150429..0000000000 --- a/packages/dea_logging_agent +++ /dev/null @@ -1 +0,0 @@ -../src/loggregator/packages/dea_logging_agent \ No newline at end of file diff --git a/packages/dea_next b/packages/dea_next deleted file mode 120000 index 05be2a6136..0000000000 --- a/packages/dea_next +++ /dev/null @@ -1 +0,0 @@ -../src/dea-hm-workspace/packages/dea_next \ No newline at end of file diff --git a/packages/hm9000 b/packages/hm9000 deleted file mode 120000 index 9541c8d395..0000000000 --- a/packages/hm9000 +++ /dev/null @@ -1 +0,0 @@ -../src/dea-hm-workspace/packages/hm9000 \ No newline at end of file diff --git a/packages/warden b/packages/warden deleted file mode 120000 index b7f55422ec..0000000000 --- a/packages/warden +++ /dev/null @@ -1 +0,0 @@ -../src/dea-hm-workspace/packages/warden \ No newline at end of file diff --git a/src/dea_next b/src/dea_next deleted file mode 120000 index 1592f5bf6f..0000000000 --- a/src/dea_next +++ /dev/null @@ -1 +0,0 @@ -dea-hm-workspace/src/dea_next \ No newline at end of file diff --git a/src/hm9000 b/src/hm9000 deleted file mode 120000 index 046dca5e2a..0000000000 --- a/src/hm9000 +++ /dev/null @@ -1 +0,0 @@ -dea-hm-workspace \ No newline at end of file diff --git a/src/warden b/src/warden deleted file mode 120000 index 7f5e13496a..0000000000 --- a/src/warden +++ /dev/null @@ -1 +0,0 @@ -dea-hm-workspace/src/warden \ No newline at end of file From 1167db55e5ae06ce48a1ac0dd049ac4b55f6b6a9 Mon Sep 17 00:00:00 2001 From: Steve Taylor Date: Fri, 19 May 2017 17:07:39 -0700 Subject: [PATCH 2/5] [#145311887] EOL dea-hm-workspace Signed-off-by: Chunyi Lyu --- src/dea-hm-workspace | 1 - 1 file changed, 1 deletion(-) delete mode 160000 src/dea-hm-workspace diff --git a/src/dea-hm-workspace b/src/dea-hm-workspace deleted file mode 160000 index 5b66a99459..0000000000 --- a/src/dea-hm-workspace +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5b66a9945971e7ad8e27fca438941148caa382ad From 706baf831c2424b0feab8f7dae3a828484b682ae Mon Sep 17 00:00:00 2001 From: Chunyi Lyu Date: Mon, 22 May 2017 10:53:26 -0700 Subject: [PATCH 3/5] Default bosh-lite CATs backend to diego [#145311887] Signed-off-by: Jesse Alford --- templates/cf-infrastructure-bosh-lite.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/cf-infrastructure-bosh-lite.yml b/templates/cf-infrastructure-bosh-lite.yml index b794ee75d8..5e1d683d14 100644 --- a/templates/cf-infrastructure-bosh-lite.yml +++ b/templates/cf-infrastructure-bosh-lite.yml @@ -1029,6 +1029,7 @@ properties: skip_ssl_validation: true nodes: 1 use_http: true + backend: diego smoke_tests: api: (( "api." system_domain )) From f9d03403676bb9fb8ba11d0619661cf00f3d5a8b Mon Sep 17 00:00:00 2001 From: Joshua Aresty Date: Mon, 22 May 2017 14:01:07 -0700 Subject: [PATCH 4/5] [#145311887] Remove all dea symlinks from jobs Signed-off-by: Steve Taylor --- jobs/dea_logging_agent | 1 - jobs/dea_next | 1 - jobs/hm9000 | 1 - 3 files changed, 3 deletions(-) delete mode 120000 jobs/dea_logging_agent delete mode 120000 jobs/dea_next delete mode 120000 jobs/hm9000 diff --git a/jobs/dea_logging_agent b/jobs/dea_logging_agent deleted file mode 120000 index 3df3d47676..0000000000 --- a/jobs/dea_logging_agent +++ /dev/null @@ -1 +0,0 @@ -../src/loggregator/jobs/dea_logging_agent \ No newline at end of file diff --git a/jobs/dea_next b/jobs/dea_next deleted file mode 120000 index ad61581d54..0000000000 --- a/jobs/dea_next +++ /dev/null @@ -1 +0,0 @@ -../src/dea-hm-workspace/jobs/dea_next \ No newline at end of file diff --git a/jobs/hm9000 b/jobs/hm9000 deleted file mode 120000 index bbff2c5452..0000000000 --- a/jobs/hm9000 +++ /dev/null @@ -1 +0,0 @@ -../src/dea-hm-workspace/jobs/hm9000 \ No newline at end of file From ae406ed7779816144a5898a1abba13690c999964 Mon Sep 17 00:00:00 2001 From: ZhangWei Date: Sat, 28 Jul 2018 17:06:07 +0800 Subject: [PATCH 5/5] change capi url --- .gitmodules | 7 ++++--- src/capi-release | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index aa4929027c..ad6a7e7dec 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,9 +19,6 @@ [submodule "src/uaa-release"] path = src/uaa-release url = https://github.com/cloudfoundry/uaa-release -[submodule "src/capi-release"] - path = src/capi-release - url = https://github.com/cloudfoundry/capi-release [submodule "src/nats-release"] path = src/nats-release url = https://github.com/cloudfoundry/nats-release @@ -61,3 +58,7 @@ [submodule "src/dotnet-core-buildpack-release"] path = src/dotnet-core-buildpack-release url = https://github.com/cloudfoundry/dotnet-core-buildpack-release +[submodule "src/capi-release"] + path = src/capi-release + url = https://github.com/ZhangWeiinHPE/capi-release.git + branch = change_ccng_url diff --git a/src/capi-release b/src/capi-release index 6f21ff2945..bf50d83fc6 160000 --- a/src/capi-release +++ b/src/capi-release @@ -1 +1 @@ -Subproject commit 6f21ff2945d8fb3a0bfbcbb0a1bb1b74ca128bb2 +Subproject commit bf50d83fc6f23dd1e837f98e9811c8e5104fd070