Skip to content

Commit 5cb1b14

Browse files
reverted config changes
1 parent e6b2e62 commit 5cb1b14

File tree

2 files changed

+2
-55
lines changed

2 files changed

+2
-55
lines changed

.circleci/config.yml

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -60,40 +60,6 @@ jobs:
6060
default: false
6161
steps:
6262
- checkout
63-
- run:
64-
name: Debug - Check if this is a PR
65-
command: |
66-
echo "CIRCLE_PULL_REQUEST: $CIRCLE_PULL_REQUEST"
67-
echo "CIRCLE_PR_NUMBER: $CIRCLE_PR_NUMBER"
68-
- attach_workspace:
69-
at: ~/
70-
- run:
71-
name: Debug - Check workspace contents
72-
command: |
73-
echo "Contents of HOME directory:"
74-
ls -la $HOME/
75-
echo "Looking for resources directory:"
76-
find $HOME -name "resources" -type d 2>/dev/null || echo "No resources directory found"
77-
- run:
78-
name: Create resources symlink
79-
command: |
80-
if [ -d "${HOME}/resources" ]; then
81-
echo "Found ${HOME}/resources, copying to /tmp/resources"
82-
sudo mkdir -p /tmp/resources
83-
sudo cp -r ${HOME}/resources/* /tmp/resources/
84-
ls -la /tmp/resources/
85-
else
86-
echo "Directory ${HOME}/resources does not exist"
87-
echo "Creating empty /tmp/resources for fallback"
88-
sudo mkdir -p /tmp/resources
89-
fi
90-
- run: echo "TEST_RESOURCES=$TEST_RESOURCES"
91-
- run: |
92-
if [ -d "$TEST_RESOURCES" ]; then
93-
ls -l $TEST_RESOURCES
94-
else
95-
echo "TEST_RESOURCES directory $TEST_RESOURCES does not exist"
96-
fi
9763
- run:
9864
name: make << parameters.test-to-run >>
9965
command: |
@@ -126,11 +92,6 @@ jobs:
12692
if ! [ -f "$HOME/resources/itzpapalotl-v1.2.0.zip" ]; then
12793
curl -L0 -o $HOME/resources/itzpapalotl-v1.2.0.zip "https://github.com/arangodb-foxx/demo-itzpapalotl/archive/v1.2.0.zip"
12894
fi
129-
- run: ls -l $HOME/resources
130-
- persist_to_workspace:
131-
root: ~/
132-
paths:
133-
- resources
13495
13596
vulncheck:
13697
executor: golang-executor

v2/tests/foxx_test.go

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ package tests
2323
import (
2424
"context"
2525
"os"
26-
"path/filepath"
2726
"testing"
2827
"time"
2928

@@ -45,22 +44,9 @@ func Test_FoxxItzpapalotlService(t *testing.T) {
4544
}
4645

4746
// /tmp/resources/ directory is provided by .travis.yml
48-
zipFilePath1 := os.Getenv("TEST_RESOURCES")
49-
if zipFilePath1 == "" {
50-
zipFilePath1 = "/tmp/resources" // fallback for local testing
51-
}
52-
53-
if info, err := os.Stat(zipFilePath1); err != nil {
54-
if os.IsNotExist(err) {
55-
t.Skipf("path %s does not exist", zipFilePath1)
56-
}
57-
t.Fatalf("error checking path %s: %v", zipFilePath1, err)
58-
} else if !info.IsDir() {
59-
t.Skipf("path %s is not directory", zipFilePath1)
60-
}
61-
62-
zipFilePath := filepath.Join(zipFilePath1, "itzpapalotl-v1.2.0.zip")
47+
zipFilePath := "/tmp/resources/itzpapalotl-v1.2.0.zip"
6348
if _, err := os.Stat(zipFilePath); os.IsNotExist(err) {
49+
// Test works only via travis pipeline unless the above file exists locally
6450
t.Skipf("file %s does not exist", zipFilePath)
6551
}
6652
mountName := "test"

0 commit comments

Comments
 (0)