Skip to content

Commit 05ef41d

Browse files
committed
Address comments and fix bugs
1 parent 8ff354d commit 05ef41d

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.idea/
2+
spark/
23
integration-test/target/
34
*.class
45
*.log
5-
*.iml
6+
*.iml

e2e/runner.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,11 @@ git checkout -B $BRANCH origin/$BRANCH
9090
TAG=$(git rev-parse HEAD | cut -c -6)
9191
echo "Spark distribution built at SHA $TAG"
9292

93+
cd $SPARK_REPO_ROOT/dist
94+
9395
if [[ $DEPLOY_MODE == cloud ]] ;
9496
then
95-
cd dist && ./sbin/build-push-docker-images.sh -r $IMAGE_REPO -t $TAG build
97+
./sbin/build-push-docker-images.sh -r $IMAGE_REPO -t $TAG build
9698
if [[ $IMAGE_REPO == gcr.io* ]] ;
9799
then
98100
gcloud docker -- push $IMAGE_REPO/spark-driver:$TAG && \
@@ -103,10 +105,11 @@ then
103105
fi
104106
else
105107
# -m option for minikube.
106-
cd dist && ./sbin/build-push-docker-images.sh -m -r $IMAGE_REPO -t $TAG build
108+
./sbin/build-push-docker-images.sh -m -r $IMAGE_REPO -t $TAG build
107109
fi
108110

109-
$TEST_ROOT/integration-test/build/mvn clean -Ddownload.plugin.skip=true integration-test \
111+
cd $TEST_ROOT/integration-test
112+
$SPARK_REPO_ROOT/build/mvn clean -Ddownload.plugin.skip=true integration-test \
110113
-Dspark-distro-tgz=$SPARK_REPO_ROOT/*.tgz \
111114
-DextraScalaTestArgs="-Dspark.kubernetes.test.master=k8s://$MASTER \
112115
-Dspark.docker.test.driverImage=$IMAGE_REPO/spark-driver:$TAG \

0 commit comments

Comments
 (0)