From 9f18d8006cfc1b540895ae752c9f24793d9610c2 Mon Sep 17 00:00:00 2001 From: cvgw Date: Fri, 14 Feb 2020 09:06:58 -0800 Subject: [PATCH 1/3] add integration tests from GH issues --- integration/dockerfiles/Dockerfile_test_issue_506 | 2 ++ integration/dockerfiles/Dockerfile_test_issue_519 | 12 ++++++++++++ integration/dockerfiles/Dockerfile_test_issue_647 | 12 ++++++++++++ integration/dockerfiles/Dockerfile_test_issue_684 | 3 +++ integration/dockerfiles/Dockerfile_test_issue_704 | 5 +++++ integration/dockerfiles/Dockerfile_test_issue_713 | 4 ++++ .../dockerfiles/Dockerfile_test_issue_713_b | 15 +++++++++++++++ 7 files changed, 53 insertions(+) create mode 100644 integration/dockerfiles/Dockerfile_test_issue_506 create mode 100644 integration/dockerfiles/Dockerfile_test_issue_519 create mode 100644 integration/dockerfiles/Dockerfile_test_issue_647 create mode 100644 integration/dockerfiles/Dockerfile_test_issue_684 create mode 100644 integration/dockerfiles/Dockerfile_test_issue_704 create mode 100644 integration/dockerfiles/Dockerfile_test_issue_713 create mode 100644 integration/dockerfiles/Dockerfile_test_issue_713_b diff --git a/integration/dockerfiles/Dockerfile_test_issue_506 b/integration/dockerfiles/Dockerfile_test_issue_506 new file mode 100644 index 0000000000..fd1aedc5a6 --- /dev/null +++ b/integration/dockerfiles/Dockerfile_test_issue_506 @@ -0,0 +1,2 @@ +FROM ubuntu:18.04 +RUN mkdir -p /var/run/test-foobar diff --git a/integration/dockerfiles/Dockerfile_test_issue_519 b/integration/dockerfiles/Dockerfile_test_issue_519 new file mode 100644 index 0000000000..40d2d653d9 --- /dev/null +++ b/integration/dockerfiles/Dockerfile_test_issue_519 @@ -0,0 +1,12 @@ +FROM alpine as base_stage +RUN echo base_stage +RUN touch meow.txt + +FROM base_stage as BUG_stage +RUN echo BUG_stage +RUN touch purr.txt + + +FROM BUG_stage as final_stage +RUN echo final_stage +RUN touch mew.txt diff --git a/integration/dockerfiles/Dockerfile_test_issue_647 b/integration/dockerfiles/Dockerfile_test_issue_647 new file mode 100644 index 0000000000..019650229c --- /dev/null +++ b/integration/dockerfiles/Dockerfile_test_issue_647 @@ -0,0 +1,12 @@ +FROM alpine:3.8 AS foo +RUN mkdir /foo +WORKDIR /foo +RUN mkdir some_dir +RUN touch some_file +RUN chmod 777 some_dir +RUN chmod 666 some_file +RUN ls -l + +FROM alpine:3.8 +COPY --from=foo /foo /bar +RUN ls -l /bar diff --git a/integration/dockerfiles/Dockerfile_test_issue_684 b/integration/dockerfiles/Dockerfile_test_issue_684 new file mode 100644 index 0000000000..59311584e4 --- /dev/null +++ b/integration/dockerfiles/Dockerfile_test_issue_684 @@ -0,0 +1,3 @@ +FROM ubuntu:rolling as builder + +RUN apt-get update && apt-get -y upgrade && apt-get -y install lib32stdc++6 wget diff --git a/integration/dockerfiles/Dockerfile_test_issue_704 b/integration/dockerfiles/Dockerfile_test_issue_704 new file mode 100644 index 0000000000..17864adafe --- /dev/null +++ b/integration/dockerfiles/Dockerfile_test_issue_704 @@ -0,0 +1,5 @@ +FROM alpine + +RUN mkdir -p /some/dir/ && echo 'first' > /some/dir/first.txt + +RUN rm /some/dir/first.txt diff --git a/integration/dockerfiles/Dockerfile_test_issue_713 b/integration/dockerfiles/Dockerfile_test_issue_713 new file mode 100644 index 0000000000..be1fe6a216 --- /dev/null +++ b/integration/dockerfiles/Dockerfile_test_issue_713 @@ -0,0 +1,4 @@ +FROM ubuntu:16.04 +ARG TEST=undefined +RUN echo $TEST > log.txt +ENTRYPOINT ["echo"] diff --git a/integration/dockerfiles/Dockerfile_test_issue_713_b b/integration/dockerfiles/Dockerfile_test_issue_713_b new file mode 100644 index 0000000000..9cb941dfa6 --- /dev/null +++ b/integration/dockerfiles/Dockerfile_test_issue_713_b @@ -0,0 +1,15 @@ +FROM botpress/server:v12_0_0 +RUN chmod -R gou+rw /botpress +WORKDIR /botpress + +RUN apt-get update \ +&& apt-get -y install curl gnupg \ +&& curl -sL https://deb.nodesource.com/setup_11.x | bash \ +&& apt-get -y install nodejs \ +&& apt-get -y install rsync \ +&& apt-get upgrade -y + +#RUN cd /botpress && npm install && npm install node-sp-auth --save-dev && npm install sp-request --save-dev && npm install activedirectory --save-dev + +#EXPOSE 3000-55000 +#CMD ["./bp"] From ce4ff8da3ff754c37d8ce6029b227053c60f7730 Mon Sep 17 00:00:00 2001 From: cvgw Date: Sat, 29 Feb 2020 14:43:23 -0800 Subject: [PATCH 2/3] set integration test timeout to 50 minutes This is the max job execution time that travis free tier supports --- integration-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-test.sh b/integration-test.sh index 0463fb89c8..3af24c922f 100755 --- a/integration-test.sh +++ b/integration-test.sh @@ -37,4 +37,4 @@ fi echo "Running integration tests..." make out/executor make out/warmer -go test ./integration/... -v --bucket "${GCS_BUCKET}" --repo "${IMAGE_REPO}" --timeout 30m "$@" +go test ./integration/... -v --bucket "${GCS_BUCKET}" --repo "${IMAGE_REPO}" --timeout 50m "$@" From 5651ff8c921dc3022662fd1945d89226d5087d12 Mon Sep 17 00:00:00 2001 From: cvgw Date: Sat, 29 Feb 2020 15:39:51 -0800 Subject: [PATCH 3/3] remove failing tests, add later --- integration/dockerfiles/Dockerfile_test_issue_506 | 2 -- integration/dockerfiles/Dockerfile_test_issue_713 | 4 ---- .../dockerfiles/Dockerfile_test_issue_713_b | 15 --------------- 3 files changed, 21 deletions(-) delete mode 100644 integration/dockerfiles/Dockerfile_test_issue_506 delete mode 100644 integration/dockerfiles/Dockerfile_test_issue_713 delete mode 100644 integration/dockerfiles/Dockerfile_test_issue_713_b diff --git a/integration/dockerfiles/Dockerfile_test_issue_506 b/integration/dockerfiles/Dockerfile_test_issue_506 deleted file mode 100644 index fd1aedc5a6..0000000000 --- a/integration/dockerfiles/Dockerfile_test_issue_506 +++ /dev/null @@ -1,2 +0,0 @@ -FROM ubuntu:18.04 -RUN mkdir -p /var/run/test-foobar diff --git a/integration/dockerfiles/Dockerfile_test_issue_713 b/integration/dockerfiles/Dockerfile_test_issue_713 deleted file mode 100644 index be1fe6a216..0000000000 --- a/integration/dockerfiles/Dockerfile_test_issue_713 +++ /dev/null @@ -1,4 +0,0 @@ -FROM ubuntu:16.04 -ARG TEST=undefined -RUN echo $TEST > log.txt -ENTRYPOINT ["echo"] diff --git a/integration/dockerfiles/Dockerfile_test_issue_713_b b/integration/dockerfiles/Dockerfile_test_issue_713_b deleted file mode 100644 index 9cb941dfa6..0000000000 --- a/integration/dockerfiles/Dockerfile_test_issue_713_b +++ /dev/null @@ -1,15 +0,0 @@ -FROM botpress/server:v12_0_0 -RUN chmod -R gou+rw /botpress -WORKDIR /botpress - -RUN apt-get update \ -&& apt-get -y install curl gnupg \ -&& curl -sL https://deb.nodesource.com/setup_11.x | bash \ -&& apt-get -y install nodejs \ -&& apt-get -y install rsync \ -&& apt-get upgrade -y - -#RUN cd /botpress && npm install && npm install node-sp-auth --save-dev && npm install sp-request --save-dev && npm install activedirectory --save-dev - -#EXPOSE 3000-55000 -#CMD ["./bp"]