Fixing integration tests

schemahero · May 30, 2019 · a4e64fe · a4e64fe
1 parent 076020b
commit a4e64fe
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ before_script:
 script:
   - go test ./pkg/... ./cmd/... -race -coverprofile=coverage.txt -covermode=atomic
   - make
-  - cd integration && make run && cd ..
+  - make -C integration run
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

diff --git a/deploy/.goreleaser.integration.yml b/deploy/.goreleaser.integration.yml
@@ -48,6 +48,8 @@ dockers:
       - "schemahero/schemahero:integration-test"
     binaries:
       - schemahero
+    extra_files:
+      - ./deploy/entrypoint.sh
   - dockerfile: ./deploy/Dockerfile.manager
     image_templates:
       - "schemahero/schemahero-manager:integration-test"

diff --git a/deploy/.goreleaser.snapshot.yml b/deploy/.goreleaser.snapshot.yml
@@ -51,6 +51,8 @@ dockers:
       - "schemahero/schemahero:alpha"
     binaries:
       - schemahero
+    extra_files:
+      - ./deploy/entrypoint.sh
   - dockerfile: ./deploy/Dockerfile.manager
     image_templates:
       - "schemahero/schemahero-manager:alpha"

diff --git a/deploy/Dockerfile.schemahero b/deploy/Dockerfile.schemahero
@@ -16,7 +16,7 @@ RUN apt-get update \
  && rm -rf /var/lib/apt/lists/* \
  && chmod +x /usr/local/bin/gosu
 
-COPY deploy/entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 RUN chmod +x /usr/local/bin/entrypoint.sh
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]