Remove CircleCI (#2449)

scionproto · Feb 13, 2019 · 4554d8d · 4554d8d
1 parent 52d70cc
commit 4554d8d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 118 deletions.
diff --git a/.buildkite/scripts/build_scion_img b/.buildkite/scripts/build_scion_img
@@ -4,5 +4,6 @@ set -e
 
 BASE_IMG=${BASE_IMG:-d0df659466340dfc30f277f383ade9f0e1069ae2d2ac621f1a04d3eed258f388}
 
-./tools/ci/prepare_image "$BASE_IMG"
+docker pull scionproto/scion_base@sha256:$BASE_IMG
+docker tag scionproto/scion_base@sha256:$BASE_IMG scion_base:latest
 ./docker.sh build
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/TESTING.md b/TESTING.md
@@ -36,7 +36,7 @@ topology, specify the `-d` flag.
 
 If you want to use `docker-compose` commands, `./tools/dc` might be helpful.
 
-### Circle-CI
-The SCION project uses Circle-CI as its continuous integration platform. To run a local version
-of Circle-CI first build a docker image as described in `docker/README.md` and then run
-`tools/ci/local`.
+### CI
+The SCION project uses Buildkite as its continuous integration platform. To run an approximated
+local version of the CI pipeline (does not include acceptance tests), first build a docker image
+as described in `docker/README.md` and then run `tools/ci/local`.
diff --git a/scion.sh b/scion.sh
@@ -105,7 +105,7 @@ cmd_mstart() {
 }
 
 run_setup() {
-    [ -n "$CIRCLECI" ] || python/integration/set_ipv6_addr.py -a
+    python/integration/set_ipv6_addr.py -a
      # Create dispatcher and sciond dirs or change owner
     local disp_dir="/run/shm/dispatcher"
     [ -d "$disp_dir" ] || mkdir "$disp_dir"

diff --git a/tools/ci/prepare_image b/tools/ci/prepare_image