hasura · shahidhk · Sep 18, 2018 · Sep 10, 2018 · Sep 10, 2018 · Sep 10, 2018
diff --git a/.ciignore b/.ciignore
@@ -5,6 +5,5 @@ assets/*
 docs/*
 community/*
 install-manifests/*
-.circleci/*
 .ciignore
 .gitignore
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -63,6 +63,40 @@ refs:
         command: |
           DATABASE_URL="postgres://gql_test:@localhost:5432/gql_test" make ci-test
 
+  # ref pytest server job
+  pytest_server: &pytest_server
+    working_directory: ~/graphql-engine
+    steps:
+    - checkout
+    - restore_cache:
+        keys:
+        - server-deps-cache-{{ checksum "server/graphql-engine.cabal" }}-{{ checksum "server/stack.yaml" }}
+    - attach_workspace:
+        at: /build
+    - *wait_for_postgres
+    - run:
+        command: /build/_server_output/graphql-engine serve
+        background: true
+        environment:
+          HASURA_GRAPHQL_DATABASE_URL: postgres://gql_test:@localhost:5432/gql_test
+    - run:
+        name: create test output dir
+        command: |
+          mkdir -p /build/_server_test_output/$PG_VERSION
+    - run:
+        name: pytest the server
+        working_directory: ./server/tests-py
+        environment:
+          DATABASE_URL: postgres://gql_test:@localhost:5432/gql_test
+          HGE_URL: http://localhost:8080
+        command: |
+          pip3 install -r requirements.txt
+          pytest -vv --hge-url="$HGE_URL" --pg-url="$DATABASE_URL"
+          ## commented for the timesake
+          # stack --system-ghc hpc report /build/_server_output/graphql-engine.tix --destdir /build/_server_test_output/$PG_VERSION
+    - store_artifacts:
+        path: /build/_server_test_output
+        destination: server_test
 
 version: 2
 jobs:
@@ -155,6 +189,34 @@ jobs:
     - image: circleci/postgres:9.5-alpine
       <<: *test_pg_env
 
+  # pytest the server with postgres versions >= 9.5
+  pytest_server_pg_10.4:
+    <<: *pytest_server
+    environment:
+      PG_VERSION: "10_4"
+    docker:
+    - image: hasura/graphql-engine-server-builder:v0.3.2
+    - image: circleci/postgres:10.4-alpine
+      <<: *test_pg_env
+
+  pytest_server_pg_9.6:
+    <<: *pytest_server
+    environment:
+      PG_VERSION: "9_6"
+    docker:
+    - image: hasura/graphql-engine-server-builder:v0.3.2
+    - image: circleci/postgres:9.6-alpine
+      <<: *test_pg_env
+
+  pytest_server_pg_9.5:
+    <<: *pytest_server
+    environment:
+      PG_VERSION: "9_5"
+    docker:
+    - image: hasura/graphql-engine-server-builder:v0.3.2
+    - image: circleci/postgres:9.5-alpine
+      <<: *test_pg_env
+
   # test and build cli
   test_and_build_cli:
     docker:
@@ -280,12 +342,27 @@ workflows:
         <<: *filter_only_vtags
         requires:
         - build_server
+    - pytest_server_pg_10.4:
+        <<: *filter_only_vtags
+        requires:
+        - build_server
+    - pytest_server_pg_9.6:
+        <<: *filter_only_vtags
+        requires:
+        - build_server
+    - pytest_server_pg_9.5:
+        <<: *filter_only_vtags
+        requires:
+        - build_server
     - all_server_tests_pass:
         <<: *filter_only_vtags
         requires:
         - test_server_pg_10.4
         - test_server_pg_9.6
         - test_server_pg_9.5
+        - pytest_server_pg_10.4
+        - pytest_server_pg_9.6
+        - pytest_server_pg_9.5
     - test_and_build_cli:
         <<: *filter_only_vtags
         requires:

diff --git a/.circleci/server-builder.dockerfile b/.circleci/server-builder.dockerfile
@@ -7,7 +7,7 @@ ARG stack_ver="1.7.1"
 # Install GNU make, curl, git and docker client. Required to build the server
 RUN apt-get -y update \
     && apt-get -y upgrade \
-    && apt-get install -y curl g++ gcc libc6-dev libpq-dev libffi-dev libgmp-dev make xz-utils zlib1g-dev git gnupg upx netcat \
+    && apt-get install -y curl g++ gcc libc6-dev libpq-dev libffi-dev libgmp-dev make xz-utils zlib1g-dev git gnupg upx netcat python3 python3-pip \
     && curl -Lo /tmp/docker-${docker_ver}.tgz https://download.docker.com/linux/static/stable/x86_64/docker-${docker_ver}.tgz \
     && tar -xz -C /tmp -f /tmp/docker-${docker_ver}.tgz \
     && mv /tmp/docker/* /usr/bin \
@@ -20,4 +20,4 @@ RUN apt-get -y update \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /usr/share/doc/ \
     && rm -rf /usr/share/man/ \
-    && rm -rf /usr/share/locale/
+    && rm -rf /usr/share/locale/
@@ -34,6 +34,8 @@ ci-binary:
 	mkdir -p $(build_output)
 	cp $(build_dir)/$(project)/$(project) $(build_output)
 	cp "$(build_dir)/$(project)-test/$(project)-test" $(build_output)
+	## commented for now
+	#cp $(project_dir)/$(project).tix $(build_output)
 	echo "$(version)" > $(build_output)/version.txt
 
 ci-test: