code changes in config

Author: bluepal-prasanthi-moparthi

.circleci/config.yml

@@ -49,26 +49,6 @@ jobs:
     environment:
       GOIMAGE: << pipeline.parameters.goImage >>
 
-  download-demo-data:
-    executor: machine-executor
-    steps:
-      - run: mkdir -p $HOME/resources
-      - run:
-          name: Download itzpapalotl demo foxx service
-          command: |
-            if [ -z "$CIRCLE_PULL_REQUEST" ]; then
-              echo "This is not a pull request. Skipping..."
-              exit 0
-            fi
-            if ! [ -f "$HOME/resources/itzpapalotl-v1.2.0.zip" ]; then
-              curl -L0 -o $HOME/resources/itzpapalotl-v1.2.0.zip "https://github.com/arangodb-foxx/demo-itzpapalotl/archive/v1.2.0.zip"
-            fi
-      - run: ls -l $HOME/resources
-      - persist_to_workspace:
-          root: ~/
-          paths:
-            - resources
-
   run-integration-tests:
     executor: machine-executor
     parameters:
@@ -82,6 +62,14 @@ jobs:
       - checkout
       - attach_workspace:
           at: ~/
+      - run:
+          name: Create resources symlink
+          command: |
+            if [ -d "${HOME}/resources" ]; then
+              sudo mkdir -p /tmp/resources
+              sudo cp -r ${HOME}/resources/* /tmp/resources/
+              ls -la /tmp/resources/
+            fi
       - run: echo "TEST_RESOURCES=$TEST_RESOURCES"
       - run: ls -l $TEST_RESOURCES
       - run:
@@ -102,6 +90,26 @@ jobs:
       TEST_DISALLOW_UNKNOWN_FIELDS: false
       VERBOSE: 1
 
+  download-demo-data:
+    executor: machine-executor
+    steps:
+      - run: mkdir -p $HOME/resources
+      - run:
+          name: Download itzpapalotl demo foxx service
+          command: |
+            if [ -z "$CIRCLE_PULL_REQUEST" ]; then
+              echo "This is not a pull request. Skipping..."
+              exit 0
+            fi
+            if ! [ -f "$HOME/resources/itzpapalotl-v1.2.0.zip" ]; then
+              curl -L0 -o $HOME/resources/itzpapalotl-v1.2.0.zip "https://github.com/arangodb-foxx/demo-itzpapalotl/archive/v1.2.0.zip"
+            fi
+      - run: ls -l $HOME/resources 
+      - persist_to_workspace:      
+          root: ~/
+          paths:
+            - resources
+
   vulncheck:
     executor: golang-executor
     steps:
@@ -131,13 +139,11 @@ workflows:
           requires:
             - download-demo-data
           test-to-run: run-tests-cluster
-
       - run-integration-tests:
           name: Test V2 cluster
           requires:
             - download-demo-data
           test-to-run: run-v2-tests-cluster
-
       - run-integration-tests:
           name: Test V2 cluster - DB extra features (compression)
           requires:
@@ -150,12 +156,12 @@ workflows:
           requires:
             - download-demo-data
           test-to-run: run-tests-single
-
       - run-integration-tests:
           name: Test V2 single
           requires:
             - download-demo-data
           test-to-run: run-v2-tests-single
+
   # Weekly vulnerability check
   weekly_vulncheck:
     jobs:
@@ -168,4 +174,4 @@ workflows:
           cron: 0 6 * * 1
           filters:
             branches:
-              only: master
+              only: master

v2/tests/foxx_test.go

@@ -23,6 +23,7 @@ package tests
 import (
 	"context"
 	"os"
+	"path/filepath"
 	"testing"
 	"time"
 
@@ -44,19 +45,22 @@ func Test_FoxxItzpapalotlService(t *testing.T) {
 		}
 
 		// /tmp/resources/ directory is provided by .travis.yml
-		zipFilePath1 := "/tmp/resources"
+		zipFilePath1 := os.Getenv("TEST_RESOURCES")
+		if zipFilePath1 == "" {
+			zipFilePath1 = "/tmp/resources" // fallback for local testing
+		}
+
 		if info, err := os.Stat(zipFilePath1); err != nil {
 			if os.IsNotExist(err) {
 				t.Skipf("path %s does not exist", zipFilePath1)
 			}
 			t.Fatalf("error checking path %s: %v", zipFilePath1, err)
 		} else if !info.IsDir() {
-			t.Skipf("path %s is not a directory", zipFilePath1)
+			t.Skipf("path %s is not directory", zipFilePath1)
 		}
 
-		zipFilePath := "/tmp/resources/itzpapalotl-v1.2.0.zip"
+		zipFilePath := filepath.Join(zipFilePath1, "itzpapalotl-v1.2.0.zip")
 		if _, err := os.Stat(zipFilePath); os.IsNotExist(err) {
-			// Test works only via travis pipeline unless the above file exists locally
 			t.Skipf("file %s does not exist", zipFilePath)
 		}
 		mountName := "test"