remove canton ee integration (digital-asset#18501)

kgeonw · Feb 16, 2024 · 92fcbb6 · 92fcbb6
1 parent c37a25e
commit 92fcbb6
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 158 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -121,5 +121,3 @@ test:windows --test_env=ComSpec
 build -c opt
 
 try-import %workspace%/.bazelrc.local
-build --build_tag_filters=-canton-ee
-test --test_tag_filters=-canton-ee
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -27,7 +27,7 @@ NOTICES     @garyverhaegen-da @dasormeter
 /compiler/          @basvangijzel-DA @remyhaemmerle-da @akrmn @dylant-da @samuel-williams-da @paulbrauner-da
 /libs-haskell/      @basvangijzel-DA @remyhaemmerle-da @akrmn @dylant-da @samuel-williams-da @paulbrauner-da
 /ghc-lib/           @basvangijzel-DA @remyhaemmerle-da @akrmn @dylant-da @samuel-williams-da @paulbrauner-da
-/test-common/canton/            @garyverhaegen-da @remyhaemmerle-da
+/test-common/canton/            @remyhaemmerle-da
 
 # Runtime
 /daml-lf/ @remyhaemmerle-da @paulbrauner-da

diff --git a/build.ps1 b/build.ps1
@@ -63,8 +63,7 @@ bazel build //... `
   `-`-profile build-profile.json `
   `-`-experimental_profile_include_target_label `
   `-`-build_event_json_file build-events.json `
-  `-`-build_event_publish_all_actions `
-  `-`-build_tag_filters=-canton-ee
+  `-`-build_event_publish_all_actions
 
 bazel shutdown
 
@@ -86,7 +85,7 @@ if ($env:SKIP_TESTS -ceq "False") {
 
     $FEWER_TESTS_FILTER = "-main-only"
 
-    $tag_filter = "-dev-canton-test,-canton-ee"
+    $tag_filter = "-dev-canton-test"
     switch ($env:TEST_MODE) {
       'main' {
           Write-Output "Running all tests because TEST_MODE is 'main'"

diff --git a/build.sh b/build.sh
@@ -57,10 +57,6 @@ if [ "$SKIP_DEV_CANTON_TESTS" = "true" ]; then
   tag_filter="$tag_filter,-dev-canton-test"
 fi
 
-if [ "$IS_FORK" = "True" ]; then
-  tag_filter="${tag_filter},-canton-ee"
-fi
-
 # remove possible leading comma
 tag_filter="${tag_filter#,}"
 

diff --git a/ci/cron/daily-compat.yml b/ci/cron/daily-compat.yml
@@ -213,28 +213,7 @@ jobs:
 
           canton3_version=$(get_canton_version_for_major_version 3)
 
-          ### update binaries ###
-
-          ee_url="https://digitalasset.jfrog.io/artifactory/assembly/canton/$canton3_version/canton-enterprise-$canton3_version.tar.gz"
-          ee_tmp=$(mktemp)
-          curl -u $AUTH --fail --location --silent "$ee_url" > $ee_tmp
-          ee_sha=$(sha256sum $ee_tmp | awk '{print $1}')
-          ee_target_url=https://digitalasset.jfrog.io/artifactory/assembly/daml/canton-backup/$canton3_version/$ee_sha/canton-enterprise-$canton3_version.tar.gz
-          if ! curl -u $AUTH -f -I $ee_target_url; then
-              curl -u $AUTH \
-                   -f \
-                   -X PUT \
-                   -H "X-Checksum-MD5: $(md5sum $ee_tmp | awk '{print $1}')" \
-                   -H "X-Checksum-SHA1: $(sha1sum $ee_tmp | awk '{print $1}')" \
-                   -H "X-Checksum-SHA256: $(sha256sum $ee_tmp | awk '{print $1}')" \
-                   -T $ee_tmp \
-                   $ee_target_url
-          fi
-
           sed -i 's|SKIP_DEV_CANTON_TESTS=.*|SKIP_DEV_CANTON_TESTS=false|' build.sh
-          sed -i "s|CANTON_ENTERPRISE_VERSION=.*|CANTON_ENTERPRISE_VERSION=$canton3_version|" test-common/canton/BUILD.bazel
-          sed -i "s|CANTON_ENTERPRISE_SHA=.*|CANTON_ENTERPRISE_SHA=$ee_sha|" test-common/canton/BUILD.bazel
-          sed -i "s|CANTON_ENTERPRISE_URL=.*|CANTON_ENTERPRISE_URL=$ee_target_url|" test-common/canton/BUILD.bazel
 
           ### code drop ###
 
@@ -250,12 +229,11 @@ jobs:
 
           branch="main-canton-update-$canton3_version"
 
-          if git diff --exit-code origin/$(Build.SourceBranchName) -- canton build.sh arbitrary_canton_sha test-common/canton/BUILD.bazel >/dev/null; then
+          if git diff --exit-code origin/$(Build.SourceBranchName) -- canton build.sh >/dev/null; then
               echo "Already up-to-date with latest Canton source & snapshot."
           else
-              if [ "main" = "$(Build.SourceBranchName)" ] \
-              || [ "main-2.x" = "$(Build.SourceBranchName)" ]; then
-                  git add build.sh test-common/canton/BUILD.bazel
+              if [ "main" = "$(Build.SourceBranchName)" ]; then
+                  git add build.sh
                   open_pr "$branch" "update canton to $canton3_version" "tell-slack: canton" "" "$(Build.SourceBranchName)"
                   az extension add --name azure-devops
                   trap "az devops logout" EXIT

diff --git a/compatibility/.bazelrc b/compatibility/.bazelrc
@@ -121,5 +121,3 @@ test:windows --test_env=ComSpec
 build -c opt
 
 try-import %workspace%/.bazelrc.local
-build --build_tag_filters=-canton-ee
-test --test_tag_filters=-canton-ee
diff --git a/test-common/canton/BUILD.bazel b/test-common/canton/BUILD.bazel
diff --git a/test-common/canton/README.md b/test-common/canton/README.md