From 3bfbec4358e477577fbad7693cb098c0fb24ba1b Mon Sep 17 00:00:00 2001
From: Rajan Gupta <rajan0493@gmail.com>
Date: Sat, 18 Jul 2020 06:39:26 +0800
Subject: [PATCH] Update streamProcessor spark download URL to archive

---
 .travis.yml                                          | 12 ++++++------
 scripts/prod-hex/services/spark-master-service.yaml  |  2 +-
 .../prod-micro/services/spark-master-service.yaml    |  2 +-
 streamProcessor/Dockerfile                           |  2 +-
 streamProcessor/Dockerfile_Prod                      |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d21a3506b..09b397a8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,9 +57,9 @@ script:
   - docker push rajagupt/facenet
   - docker push rajagupt/training-watchdog
   #Deploy on AWS EC2 from Master
-  - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then openssl aes-256-cbc -k "$DECRYPT_KEY" -in iss-dev-upresent.pem.enc -out iss-dev-upresent.pem -d -md sha256; fi
-  - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then chmod 400 iss-dev-upresent.pem; fi
-  - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then ssh -o StrictHostKeyChecking=no -i iss-dev-upresent.pem $EC2_INSTANCE "cd uPresent/scripts/dev && docker-compose down"; fi
-  - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then ssh -o StrictHostKeyChecking=no -i iss-dev-upresent.pem $EC2_INSTANCE "cd uPresent/scripts/dev && docker image prune -a -f"; fi
-  - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then ssh -o StrictHostKeyChecking=no -i iss-dev-upresent.pem $EC2_INSTANCE "cd uPresent && sudo git pull"; fi
-  - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then ssh -o StrictHostKeyChecking=no -i iss-dev-upresent.pem $EC2_INSTANCE "cd uPresent/scripts/dev && docker-compose up -d"; fi
+  # - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then openssl aes-256-cbc -k "$DECRYPT_KEY" -in iss-dev-upresent.pem.enc -out iss-dev-upresent.pem -d -md sha256; fi
+  # - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then chmod 400 iss-dev-upresent.pem; fi
+  # - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then ssh -o StrictHostKeyChecking=no -i iss-dev-upresent.pem $EC2_INSTANCE "cd uPresent/scripts/dev && docker-compose down"; fi
+  # - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then ssh -o StrictHostKeyChecking=no -i iss-dev-upresent.pem $EC2_INSTANCE "cd uPresent/scripts/dev && docker image prune -a -f"; fi
+  # - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then ssh -o StrictHostKeyChecking=no -i iss-dev-upresent.pem $EC2_INSTANCE "cd uPresent && sudo git pull"; fi
+  # - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_EVENT_TYPE == "push" ]; then ssh -o StrictHostKeyChecking=no -i iss-dev-upresent.pem $EC2_INSTANCE "cd uPresent/scripts/dev && docker-compose up -d"; fi
diff --git a/scripts/prod-hex/services/spark-master-service.yaml b/scripts/prod-hex/services/spark-master-service.yaml
index 3d05b21d9..2c887b85d 100644
--- a/scripts/prod-hex/services/spark-master-service.yaml
+++ b/scripts/prod-hex/services/spark-master-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: spark
+  name: spark-master-svc
   namespace: production
 spec:
   selector:
diff --git a/scripts/prod-micro/services/spark-master-service.yaml b/scripts/prod-micro/services/spark-master-service.yaml
index 3d05b21d9..2c887b85d 100644
--- a/scripts/prod-micro/services/spark-master-service.yaml
+++ b/scripts/prod-micro/services/spark-master-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: spark
+  name: spark-master-svc
   namespace: production
 spec:
   selector:
diff --git a/streamProcessor/Dockerfile b/streamProcessor/Dockerfile
index 75ea891f8..f5742529a 100644
--- a/streamProcessor/Dockerfile
+++ b/streamProcessor/Dockerfile
@@ -6,7 +6,7 @@ RUN apt-get update \
     && apt-get clean
 
 RUN cd /usr/ \
-    && wget "https://downloads.apache.org/spark/spark-2.4.5/spark-2.4.5-bin-hadoop2.7.tgz" \
+    && wget "http://archive.apache.org/dist/spark/spark-2.4.5/spark-2.4.5-bin-hadoop2.7.tgz" \
     && tar xzf spark-2.4.5-bin-hadoop2.7.tgz \
     && rm spark-2.4.5-bin-hadoop2.7.tgz \
     && mv spark-2.4.5-bin-hadoop2.7 spark
diff --git a/streamProcessor/Dockerfile_Prod b/streamProcessor/Dockerfile_Prod
index 09b28b0d0..536a07eee 100644
--- a/streamProcessor/Dockerfile_Prod
+++ b/streamProcessor/Dockerfile_Prod
@@ -6,14 +6,14 @@ RUN apt-get update \
     && apt-get clean
 
 RUN cd /usr/ \
-    && wget "https://downloads.apache.org/spark/spark-2.4.5/spark-2.4.5-bin-hadoop2.7.tgz" \
+    && wget "http://archive.apache.org/dist/spark/spark-2.4.5/spark-2.4.5-bin-hadoop2.7.tgz" \
     && tar xzf spark-2.4.5-bin-hadoop2.7.tgz \
     && rm spark-2.4.5-bin-hadoop2.7.tgz \
     && mv spark-2.4.5-bin-hadoop2.7 spark
 
 ENV SPARK_HOME=/usr/spark
 ENV PYTHONPATH=$SPARK_HOME/python/lib/py4j-0.10.7-src.zip:$SPARK_HOME/python/:$PYTHONPATH
-ENV MASTER=spark://spark:7077
+ENV MASTER=spark://spark-master-svc:7077
 
 RUN mkdir -p /usr/spark/work/ \
     && chmod -R 777 /usr/spark/work/