chore: Remove docker-compose from integration tests (#3622)

vectordotdev · Sep 10, 2020 · 1a1352b · 1a1352b
1 parent 94def0f
commit 1a1352b
Show file tree

Hide file tree

Showing 23 changed files with 339 additions and 451 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -45,6 +45,7 @@ env:
   RUST_BACKTRACE: full
   AWS_ACCESS_KEY_ID: "dummy"
   AWS_SECRET_ACCESS_KEY: "dummy"
+  CONTAINER_TOOL: "docker"
 
 jobs:
   cancel-previous:
@@ -152,7 +153,7 @@ jobs:
           KUBERNETES_VERSION: ${{ matrix.kubernetes_version.version }}
           MINIKUBE_VERSION: ${{ matrix.minikube_version }}
           CONTAINER_RUNTIME: ${{ matrix.container_runtime }}
-      - run: USE_CONTAINER=none make slim-builds
+      - run: make slim-builds
       - run: make test-e2e-kubernetes
         env:
           USE_MINIKUBE_CACHE: "true"

diff --git a/.github/workflows/install-sh.yml b/.github/workflows/install-sh.yml
@@ -14,5 +14,4 @@ jobs:
       - env:
           AWS_ACCESS_KEY_ID: "${{ secrets.CI_AWS_ACCESS_KEY_ID }}"
           AWS_SECRET_ACCESS_KEY: "${{ secrets.CI_AWS_SECRET_ACCESS_KEY }}"
-          USE_CONTAINER: none
         run: make sync-install
diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml
@@ -13,6 +13,7 @@ env:
   RUST_BACKTRACE: full
   AWS_ACCESS_KEY_ID: "dummy"
   AWS_SECRET_ACCESS_KEY: "dummy"
+  CONTAINER_TOOL: "docker"
 
 jobs:
   cancel-previous:

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -73,7 +73,6 @@ jobs:
       - name: "Build archive"
         env:
           TARGET: "x86_64-apple-darwin"
-          USE_CONTAINER: none
           NATIVE_BUILD: true
         run: |
           export PATH="$HOME/.cargo/bin:$PATH"
@@ -130,7 +129,6 @@ jobs:
           export RUST_LTO=""
           export TARGET="x86_64-pc-windows-msvc"
           export NATIVE_BUILD="true"
-          export USE_CONTAINER="none"
           make package-archive
       - name: "Build package"
         shell: bash
@@ -173,7 +171,6 @@ jobs:
           DOCKER_USERNAME: "${{ secrets.CI_DOCKER_USERNAME }}"
           DOCKER_PASSWORD: "${{ secrets.CI_DOCKER_PASSWORD }}"
           PLATFORM: "linux/amd64,linux/arm64"
-          USE_CONTAINER: none
         run: |
           ./scripts/upgrade-docker.sh
           export VERSION=$(make version)
@@ -232,7 +229,6 @@ jobs:
       - env:
           AWS_ACCESS_KEY_ID: "${{ secrets.CI_AWS_ACCESS_KEY_ID }}"
           AWS_SECRET_ACCESS_KEY: "${{ secrets.CI_AWS_SECRET_ACCESS_KEY }}"
-          USE_CONTAINER: none
         run: make release-s3
 
   release-helm:
@@ -249,5 +245,4 @@ jobs:
         env:
           AWS_ACCESS_KEY_ID: "${{ secrets.CI_AWS_ACCESS_KEY_ID }}"
           AWS_SECRET_ACCESS_KEY: "${{ secrets.CI_AWS_SECRET_ACCESS_KEY }}"
-          USE_CONTAINER: none
         run: make release-helm
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -71,7 +71,6 @@ jobs:
       - name: "Build archive"
         env:
           TARGET: "x86_64-apple-darwin"
-          USE_CONTAINER: none
           NATIVE_BUILD: true
         run: |
           export PATH="$HOME/.cargo/bin:$PATH"
@@ -95,7 +94,6 @@ jobs:
           export RUST_LTO=""
           export TARGET="x86_64-pc-windows-msvc"
           export NATIVE_BUILD="true"
-          export USE_CONTAINER="none"
           make package-archive
       - name: "Build package"
         shell: bash
@@ -138,7 +136,6 @@ jobs:
           DOCKER_USERNAME: "${{ secrets.CI_DOCKER_USERNAME }}"
           DOCKER_PASSWORD: "${{ secrets.CI_DOCKER_PASSWORD }}"
           PLATFORM: "linux/amd64,linux/arm64,linux/arm"
-          USE_CONTAINER: none
         run: |
           ./scripts/upgrade-docker.sh
           export VERSION=$(make version)
@@ -197,7 +194,6 @@ jobs:
       - env:
           AWS_ACCESS_KEY_ID: "${{ secrets.CI_AWS_ACCESS_KEY_ID }}"
           AWS_SECRET_ACCESS_KEY: "${{ secrets.CI_AWS_SECRET_ACCESS_KEY }}"
-          USE_CONTAINER: none
         run: make release-s3
 
   release-github:
@@ -329,5 +325,4 @@ jobs:
         env:
           AWS_ACCESS_KEY_ID: "${{ secrets.CI_AWS_ACCESS_KEY_ID }}"
           AWS_SECRET_ACCESS_KEY: "${{ secrets.CI_AWS_SECRET_ACCESS_KEY }}"
-          USE_CONTAINER: none
         run: make release-helm
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -41,6 +41,7 @@ env:
   RUST_BACKTRACE: full
   AWS_ACCESS_KEY_ID: "dummy"
   AWS_SECRET_ACCESS_KEY: "dummy"
+  CONTAINER_TOOL: "docker"
 
 jobs:
   cancel-previous:
@@ -103,7 +104,6 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - env:
-          USE_CONTAINER: none
           RUSTFLAGS: "-D warnings"
         run: cargo test --no-default-features --features default-msvc