From ef119d950565477c22ac8444568ce1fb70d6b770 Mon Sep 17 00:00:00 2001
From: baghbidi <Kalpase_87>
Date: Tue, 16 Apr 2019 23:40:31 -0700
Subject: [PATCH 01/31] Support Env vars and CMD in Pods

---
 src/services/kubelet-service.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/services/kubelet-service.js b/src/services/kubelet-service.js
index 65a4cd13c..d55154947 100644
--- a/src/services/kubelet-service.js
+++ b/src/services/kubelet-service.js
@@ -90,6 +90,13 @@ const kubeletCreatePod = async function (createPodData, fogNodeUuid, user, trans
       ports: ms.ports || [],
       routes: ms.routes || [],
     }
+    if (ms.env && ms.env.length > 0) {
+      microserviceData.env = ms.env
+    }
+    if (ms.cmd && ms.cmd.length > 0) {
+      microserviceData.cmd = ms.cmd
+    }
+
     microservice = await MicroservicesService.createMicroserviceEndPoint(microserviceData, user, false, transaction)
     microservicesIds.push(microservice.uuid)
   }
@@ -123,7 +130,7 @@ const kubeletUpdatePod = async function (uploadPodData, fogNodeUuid, user, trans
   msDup.map((ms) => {
     const name = `${flowData.name}-${ms.name}`
 
-    return {
+    const microserviceData = {
       name: name,
       config: ms.config,
       catalogItemId: ms['catalog-item-id'],
@@ -134,6 +141,14 @@ const kubeletUpdatePod = async function (uploadPodData, fogNodeUuid, user, trans
       ports: ms.ports || [],
       routes: ms.routes || [],
     }
+    if (ms.env && ms.env.length > 0) {
+      microserviceData.env = ms.env
+    }
+    if (ms.cmd && ms.cmd.length > 0) {
+      microserviceData.cmd = ms.cmd
+    }
+
+    return microserviceData
   })
 }
 

From 3ea858a7829a756632a505cf51c510208d957318 Mon Sep 17 00:00:00 2001
From: baghbidi <Kalpase_87>
Date: Mon, 22 Apr 2019 23:22:09 -0700
Subject: [PATCH 02/31] Dockerfiles

---
 .travis.yml    | 15 +++++++++++++++
 Dockerfile.dev | 13 +++++++++++++
 Dockerfile.rel | 11 +++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 Dockerfile.dev
 create mode 100644 Dockerfile.rel

diff --git a/.travis.yml b/.travis.yml
index b127b8313..eab84eb41 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,9 @@ notifications:
     on_failure: always
     template:
       - "Build <%{build_url}|#%{build_number}> (<%{compare_url}|%{commit}>) of %{repository_slug}@%{branch} in PR <%{pull_request_url}|#%{pull_request_number}> by %{author} %{result} in %{duration}"
+env:
+  global:
+    - COMMIT=${TRAVIS_COMMIT::8}
 stages:
 - name: test
   if: branch =~ /^release-.*$/ OR branch IN (develop, master)
@@ -46,10 +49,17 @@ jobs:
       $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP:/iofogcontroller 
     - sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP
       "npm i --unsafe-perm -g /iofogcontroller/iofogcontroller-*.tgz; iofog-controller start"
+    - docker build -t edgeworx/controller-dev:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.dev
+    - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
+    - docker push edgeworx/controller-dev:latest
+    - docker tag edgeworx/controller-dev:latest edgeworx/controller-dev:$COMMIT
+    - docker push edgeworx/controller-dev:$COMMIT
   - stage: pre_release_deploy
     before_install:
     - sudo apt-get install sshpass
     script: skip
+    before_deploy:
+    - npm pack
     #- npm version prerelease --preid=prerelease -m "upgrade to %s for prerelease package"
     deploy:
       skip_cleanup: true
@@ -62,6 +72,11 @@ jobs:
     after_deploy:
     - sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP
       "iofog-controller stop; npm i --unsafe-perm -g iofogcontroller@dev; iofog-controller start"
+    - docker build -t edgeworx/controller:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.dev
+    - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
+    - docker push edgeworx/controller:latest
+    - docker tag edgeworx/controller:latest edgeworx/controller:$COMMIT
+    - docker push edgeworx/controller:$COMMIT
   - stage: release_deploy
     before_install:
     - sudo apt-get install sshpass
diff --git a/Dockerfile.dev b/Dockerfile.dev
new file mode 100644
index 000000000..dde6db245
--- /dev/null
+++ b/Dockerfile.dev
@@ -0,0 +1,13 @@
+FROM node:alpine
+
+ARG FILENAME
+ENV NODE_ENV=development
+
+COPY ${FILENAME} /tmp
+
+RUN npm i --unsafe-perm -g /tmp/${FILENAME} && \
+  rm /tmp/${FILENAME} && \
+  iofog-controller config dev-mode --on && \
+  echo "iofog-controller start && tail -f /dev/null" >> /start.sh
+
+CMD [ "sh", "/start.sh" ]
\ No newline at end of file
diff --git a/Dockerfile.rel b/Dockerfile.rel
new file mode 100644
index 000000000..9b99a1fd5
--- /dev/null
+++ b/Dockerfile.rel
@@ -0,0 +1,11 @@
+FROM node:alpine
+
+ARG FILENAME
+
+COPY ${FILENAME} /tmp
+
+RUN npm i --unsafe-perm -g /tmp/${FILENAME} && \
+  rm /tmp/${FILENAME} && \
+  echo "iofog-controller start && tail -f /dev/null" >> /start.sh
+
+CMD [ "sh", "/start.sh" ]
\ No newline at end of file

From f24fbcec94b1b9080b0fee2268a3a65c7ce359bc Mon Sep 17 00:00:00 2001
From: baghbidi <Kalpase_87>
Date: Thu, 25 Apr 2019 20:21:26 -0700
Subject: [PATCH 03/31] Add JRC and Attinad dev deployments

---
 .travis.yml | 41 ++++++++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eab84eb41..09af25050 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,17 +43,36 @@ jobs:
       on:
         branch: develop  
     after_deploy:
-    - sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP
-      "iofog-controller stop; rm -f /iofogcontroller/*"
-    - sshpass -p $DEV_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no iofogcontroller-*.tgz 
-      $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP:/iofogcontroller 
-    - sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP
-      "npm i --unsafe-perm -g /iofogcontroller/iofogcontroller-*.tgz; iofog-controller start"
-    - docker build -t edgeworx/controller-dev:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.dev
-    - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
-    - docker push edgeworx/controller-dev:latest
-    - docker tag edgeworx/controller-dev:latest edgeworx/controller-dev:$COMMIT
-    - docker push edgeworx/controller-dev:$COMMIT
+      - sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP
+        "iofog-controller stop; rm -f /iofogcontroller/*"
+      - sshpass -p $DEV_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no iofogcontroller-*.tgz 
+        $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP:/iofogcontroller 
+      - sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP
+        "npm i --unsafe-perm -g /iofogcontroller/iofogcontroller-*.tgz; iofog-controller start"
+
+      - sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP
+        "iofog-controller stop; rm -f /iofogcontroller/*"
+      - sshpass -p $JRC_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no iofogcontroller-*.tgz 
+        $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP:/iofogcontroller 
+      - sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP
+        "npm i --unsafe-perm -g /iofogcontroller/iofogcontroller-*.tgz; iofog-controller start"
+      - sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP
+        "iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${JRC_MACHINE_PASSWORD}"
+
+      - sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP
+        "iofog-controller stop; rm -f /iofogcontroller/*"
+      - sshpass -p $ATTINAD_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no iofogcontroller-*.tgz 
+        $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP:/iofogcontroller 
+      - sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP
+        "npm i --unsafe-perm -g /iofogcontroller/iofogcontroller-*.tgz; iofog-controller start"
+      - sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP
+        "iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${ATTINAD_MACHINE_PASSWORD}"
+
+      - docker build -t iofog/controller-develop:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.dev
+      - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
+      - docker push iofog/controller-develop:latest
+      - docker tag iofog/controller-develop:latest iofog/controller-develop:$COMMIT
+      - docker push iofog/controller-develop:$COMMIT
   - stage: pre_release_deploy
     before_install:
     - sudo apt-get install sshpass

From 96aa520614ac62537a836e42cfa794bde7540be5 Mon Sep 17 00:00:00 2001
From: baghbidi <Kalpase_87>
Date: Thu, 25 Apr 2019 21:49:44 -0700
Subject: [PATCH 04/31] Update docker base image

---
 .travis.yml    | 56 ++++++++++++++++++++++++++++----------------------
 Dockerfile.dev |  2 +-
 Dockerfile.rel |  2 +-
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 09af25050..dc46994b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,36 +43,38 @@ jobs:
       on:
         branch: develop  
     after_deploy:
+      - export FILENAME=$(ls iofogcontroller-*.tgz)
+
       - sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP
-        "iofog-controller stop; rm -f /iofogcontroller/*"
-      - sshpass -p $DEV_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no iofogcontroller-*.tgz 
-        $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP:/iofogcontroller 
+        "iofog-controller stop; rm -f /iofogcontroller*"
+      - sshpass -p $DEV_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME
+        $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP:/$FILENAME || travis_terminate 1; 
       - sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP
-        "npm i --unsafe-perm -g /iofogcontroller/iofogcontroller-*.tgz; iofog-controller start"
+        "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" || travis_terminate 1; 
 
       - sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP
-        "iofog-controller stop; rm -f /iofogcontroller/*"
-      - sshpass -p $JRC_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no iofogcontroller-*.tgz 
-        $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP:/iofogcontroller 
+        "iofog-controller stop; rm -f /iofogcontroller*"
+      - sshpass -p $JRC_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME
+        $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP:/$FILENAME || travis_terminate 1; 
       - sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP
-        "npm i --unsafe-perm -g /iofogcontroller/iofogcontroller-*.tgz; iofog-controller start"
+        "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" || travis_terminate 1; 
       - sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP
-        "iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${JRC_MACHINE_PASSWORD}"
+        "iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${JRC_MACHINE_PASSWORD}" || travis_terminate 1; 
 
       - sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP
-        "iofog-controller stop; rm -f /iofogcontroller/*"
-      - sshpass -p $ATTINAD_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no iofogcontroller-*.tgz 
-        $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP:/iofogcontroller 
+        "iofog-controller stop; rm -f /iofogcontroller*"
+      - sshpass -p $ATTINAD_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME
+        $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP:/$FILENAME || travis_terminate 1; 
       - sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP
-        "npm i --unsafe-perm -g /iofogcontroller/iofogcontroller-*.tgz; iofog-controller start"
+        "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" || travis_terminate 1; 
       - sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP
-        "iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${ATTINAD_MACHINE_PASSWORD}"
+        "iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${ATTINAD_MACHINE_PASSWORD}" || travis_terminate 1; 
 
-      - docker build -t iofog/controller-develop:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.dev
+      - docker build -t iofog/controller-develop:latest --build-arg FILENAME=$FILENAME . -f Dockerfile.dev || travis_terminate 1; 
       - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
-      - docker push iofog/controller-develop:latest
-      - docker tag iofog/controller-develop:latest iofog/controller-develop:$COMMIT
-      - docker push iofog/controller-develop:$COMMIT
+      - docker push iofog/controller-develop:latest || travis_terminate 1; 
+      - docker tag iofog/controller-develop:latest iofog/controller-develop:$COMMIT || travis_terminate 1; 
+      - docker push iofog/controller-develop:$COMMIT || travis_terminate 1; 
   - stage: pre_release_deploy
     before_install:
     - sudo apt-get install sshpass
@@ -90,12 +92,14 @@ jobs:
         all_branches: true
     after_deploy:
     - sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP
-      "iofog-controller stop; npm i --unsafe-perm -g iofogcontroller@dev; iofog-controller start"
-    - docker build -t edgeworx/controller:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.dev
+      "iofog-controller stop"
+    - sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP
+      "npm i --unsafe-perm -g iofogcontroller@dev; iofog-controller start" || travis_terminate 1;
+    - docker build -t edgeworx/controller:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.dev || travis_terminate 1; 
     - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
-    - docker push edgeworx/controller:latest
-    - docker tag edgeworx/controller:latest edgeworx/controller:$COMMIT
-    - docker push edgeworx/controller:$COMMIT
+    - docker push edgeworx/controller:latest || travis_terminate 1; 
+    - docker tag edgeworx/controller:latest edgeworx/controller:$COMMIT || travis_terminate 1;
+    - docker push edgeworx/controller:$COMMIT || travis_terminate 1; 
   - stage: release_deploy
     before_install:
     - sudo apt-get install sshpass
@@ -110,5 +114,7 @@ jobs:
       on:
         branch: master
     after_deploy:
-    - sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP
-      "iofog-controller stop; npm update --unsafe-perm -g iofogcontroller; iofog-controller start"
+      - sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP
+        "iofog-controller stop"
+      - sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP
+        "npm update --unsafe-perm -g iofogcontroller; iofog-controller start" || travis_terminate 1;
diff --git a/Dockerfile.dev b/Dockerfile.dev
index dde6db245..7ca90a17d 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM node:alpine
+FROM iofog/node:alpine
 
 ARG FILENAME
 ENV NODE_ENV=development
diff --git a/Dockerfile.rel b/Dockerfile.rel
index 9b99a1fd5..29a102d97 100644
--- a/Dockerfile.rel
+++ b/Dockerfile.rel
@@ -1,4 +1,4 @@
-FROM node:alpine
+FROM iofog/node:alpine
 
 ARG FILENAME
 

From a4c46e9e616a74c7539488e71839fc5b654e3fda Mon Sep 17 00:00:00 2001
From: baghbidi <Kalpase_87>
Date: Thu, 25 Apr 2019 21:57:22 -0700
Subject: [PATCH 05/31] fix image tags

---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 620e103d1..a3dc8b595 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -93,11 +93,12 @@ jobs:
         "iofog-controller stop"
       - sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP
         "npm i --unsafe-perm -g iofogcontroller@dev; iofog-controller start" || travis_terminate 1;
+      - export VERSION=`npm view iofogcontroller version`
       - docker build -t edgeworx/controller:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.dev || travis_terminate 1; 
       - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
-      - docker push edgeworx/controller:latest || travis_terminate 1; 
-      - docker tag edgeworx/controller:latest edgeworx/controller:$COMMIT || travis_terminate 1;
-      - docker push edgeworx/controller:$COMMIT || travis_terminate 1; 
+      - docker push iofog/controller:rc || travis_terminate 1; 
+      - docker tag iofog/controller:rc iofog/controller:rc-$VERSION || travis_terminate 1; 
+      - docker push iofog/controller:rc-$VERSION || travis_terminate 1; 
   - stage: release_deploy
     before_install:
       - sudo apt-get install sshpass

From f38b70ddc4e6f00eeeab4aa4d365463cd81bcaad Mon Sep 17 00:00:00 2001
From: baghbidi <Kalpase_87>
Date: Thu, 25 Apr 2019 21:59:42 -0700
Subject: [PATCH 06/31] one more

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a3dc8b595..13bce613f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,7 +94,7 @@ jobs:
       - sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP
         "npm i --unsafe-perm -g iofogcontroller@dev; iofog-controller start" || travis_terminate 1;
       - export VERSION=`npm view iofogcontroller version`
-      - docker build -t edgeworx/controller:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.dev || travis_terminate 1; 
+      - docker build -t iofog/controller:rc --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.rel || travis_terminate 1; 
       - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
       - docker push iofog/controller:rc || travis_terminate 1; 
       - docker tag iofog/controller:rc iofog/controller:rc-$VERSION || travis_terminate 1; 

From 9f27705def2f910cb0b08c3e96cc88718e357b23 Mon Sep 17 00:00:00 2001
From: baghbidi <Kalpase_87>
Date: Thu, 25 Apr 2019 22:13:36 -0700
Subject: [PATCH 07/31] Change script to mutiline

---
 .travis.yml | 101 +++++++++++++++++++++++++---------------------------
 1 file changed, 49 insertions(+), 52 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 13bce613f..50075c160 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,38 +42,35 @@ jobs:
       on:
         branch: develop  
     after_deploy:
-      - export FILENAME=$(ls iofogcontroller-*.tgz)
-
-      - sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP
-        "iofog-controller stop; rm -f /iofogcontroller*"
-      - sshpass -p $DEV_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME
-        $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP:/$FILENAME || travis_terminate 1; 
-      - sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP
-        "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" || travis_terminate 1; 
-
-      - sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP
-        "iofog-controller stop; rm -f /iofogcontroller*"
-      - sshpass -p $JRC_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME
-        $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP:/$FILENAME || travis_terminate 1; 
-      - sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP
-        "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" || travis_terminate 1; 
-      - sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP
-        "iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${JRC_MACHINE_PASSWORD}" || travis_terminate 1; 
-
-      - sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP
-        "iofog-controller stop; rm -f /iofogcontroller*"
-      - sshpass -p $ATTINAD_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME
-        $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP:/$FILENAME || travis_terminate 1; 
-      - sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP
-        "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" || travis_terminate 1; 
-      - sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP
-        "iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${ATTINAD_MACHINE_PASSWORD}" || travis_terminate 1; 
-
-      - docker build -t iofog/controller-develop:latest --build-arg FILENAME=$FILENAME . -f Dockerfile.dev || travis_terminate 1; 
-      - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
-      - docker push iofog/controller-develop:latest || travis_terminate 1; 
-      - docker tag iofog/controller-develop:latest iofog/controller-develop:$COMMIT || travis_terminate 1; 
-      - docker push iofog/controller-develop:$COMMIT || travis_terminate 1; 
+      - |
+        export FILENAME=`ls iofogcontroller-*.tgz` &&
+        sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP \
+          "iofog-controller stop; rm -f /iofogcontroller*" &&
+        sshpass -p $DEV_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME \
+          $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP:/$FILENAME &&
+        sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP \
+          "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" &&
+        sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
+          "iofog-controller stop; rm -f /iofogcontroller*" &&
+        sshpass -p $JRC_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME \
+          $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP:/$FILENAME &&
+        sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
+          "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" &&
+        sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
+          "iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${JRC_MACHINE_PASSWORD}" &&
+        sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
+          "iofog-controller stop; rm -f /iofogcontroller*" &&
+        sshpass -p $ATTINAD_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME \
+          $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP:/$FILENAME && 
+        sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
+          "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" &&
+        sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
+          "iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${ATTINAD_MACHINE_PASSWORD}" &&
+        docker build -t iofog/controller-develop:latest --build-arg FILENAME=$FILENAME . -f Dockerfile.dev && 
+        echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin &&
+        docker push iofog/controller-develop:latest &&
+        docker tag iofog/controller-develop:latest iofog/controller-develop:$COMMIT &&
+        docker push iofog/controller-develop:$COMMIT
   - stage: pre_release_deploy
     before_install:
       - sudo apt-get install sshpass
@@ -89,16 +86,16 @@ jobs:
       on:
         all_branches: true
     after_deploy:
-      - sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP
-        "iofog-controller stop"
-      - sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP
-        "npm i --unsafe-perm -g iofogcontroller@dev; iofog-controller start" || travis_terminate 1;
-      - export VERSION=`npm view iofogcontroller version`
-      - docker build -t iofog/controller:rc --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.rel || travis_terminate 1; 
-      - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
-      - docker push iofog/controller:rc || travis_terminate 1; 
-      - docker tag iofog/controller:rc iofog/controller:rc-$VERSION || travis_terminate 1; 
-      - docker push iofog/controller:rc-$VERSION || travis_terminate 1; 
+      - |
+        sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP "iofog-controller stop" &&
+        sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP \
+          "npm i --unsafe-perm -g iofogcontroller@dev; iofog-controller start" &&
+        export VERSION=`npm view iofogcontroller version` &&
+        docker build -t iofog/controller:rc --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.rel &&
+        echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin &&
+        docker push iofog/controller:rc &&
+        docker tag iofog/controller:rc iofog/controller:rc-$VERSION &&
+        docker push iofog/controller:rc-$VERSION
   - stage: release_deploy
     before_install:
       - sudo apt-get install sshpass
@@ -114,13 +111,13 @@ jobs:
       on:
         branch: master
     after_deploy:
-      - sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP
-        "iofog-controller stop"
-      - sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP
-        "npm update --unsafe-perm -g iofogcontroller; iofog-controller start" || travis_terminate 1;
-      - export VERSION=`npm view iofogcontroller version`
-      - docker build -t iofog/controller:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.rel
-      - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
-      - docker push iofog/controller:latest
-      - docker tag iofog/controller:latest iofog/controller:$VERSION
-      - docker push iofog/controller:$VERSION
+      - |
+        sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP "iofog-controller stop" &&
+        sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP \
+          "npm update --unsafe-perm -g iofogcontroller; iofog-controller start" &&
+        export VERSION=`npm view iofogcontroller version` &&
+        docker build -t iofog/controller:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.rel &&
+        echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin &&
+        docker push iofog/controller:latest &&
+        docker tag iofog/controller:latest iofog/controller:$VERSION &&
+        docker push iofog/controller:$VERSION

From 4c36ca65cfb5261dc84d28cd5859ee5cf8f51e93 Mon Sep 17 00:00:00 2001
From: baghbidi <Kalpase_87>
Date: Thu, 25 Apr 2019 22:47:06 -0700
Subject: [PATCH 08/31] Continue build if controller is not installed

---
 .travis.yml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 50075c160..533b722cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,34 +43,40 @@ jobs:
         branch: develop  
     after_deploy:
       - |
-        export FILENAME=`ls iofogcontroller-*.tgz` &&
         sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP \
-          "iofog-controller stop; rm -f /iofogcontroller*" &&
+          "iofog-controller stop; rm -R /iofogcontroller*" &&
+        sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
+          "iofog-controller stop; rm -R /iofogcontroller*" &&
+        sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
+          "iofog-controller stop; rm -R /iofogcontroller*"
+
+      - |
+        export FILENAME=`ls iofogcontroller-*.tgz` &&
         sshpass -p $DEV_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME \
           $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP:/$FILENAME &&
         sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP \
           "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" &&
-        sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
-          "iofog-controller stop; rm -f /iofogcontroller*" &&
         sshpass -p $JRC_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME \
           $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP:/$FILENAME &&
         sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
           "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" &&
         sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
-          "iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${JRC_MACHINE_PASSWORD}" &&
-        sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
-          "iofog-controller stop; rm -f /iofogcontroller*" &&
+          "iofog-controller user add -f John -l Doe -e user@domain.com -p ${JRC_MACHINE_PASSWORD}" &&
+        sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
+          "iofog-controller connector add -n connector -d localhost -i 127.0.0.1 -H" &&
         sshpass -p $ATTINAD_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME \
           $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP:/$FILENAME && 
         sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
           "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" &&
         sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
-          "iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${ATTINAD_MACHINE_PASSWORD}" &&
+          "iofog-controller user add -f John -l Doe -e user@domain.com -p ${ATTINAD_MACHINE_PASSWORD}" &&
+        sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
+          "iofog-controller connector add -n connector -d localhost -i 127.0.0.1 -H" &&
         docker build -t iofog/controller-develop:latest --build-arg FILENAME=$FILENAME . -f Dockerfile.dev && 
         echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin &&
         docker push iofog/controller-develop:latest &&
         docker tag iofog/controller-develop:latest iofog/controller-develop:$COMMIT &&
-        docker push iofog/controller-develop:$COMMIT
+        docker push iofog/controller-develop:$COMMIT || travis_terminate 1
   - stage: pre_release_deploy
     before_install:
       - sudo apt-get install sshpass
@@ -86,8 +92,8 @@ jobs:
       on:
         all_branches: true
     after_deploy:
+      - sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP "iofog-controller stop"
       - |
-        sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP "iofog-controller stop" &&
         sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP \
           "npm i --unsafe-perm -g iofogcontroller@dev; iofog-controller start" &&
         export VERSION=`npm view iofogcontroller version` &&

From e8f53675428715fa857cc7a7a64bfacacba0c4fb Mon Sep 17 00:00:00 2001
From: baghbidi <Kalpase_87>
Date: Thu, 25 Apr 2019 22:50:28 -0700
Subject: [PATCH 09/31] Fail is script failed

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 533b722cd..8b55ab4f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -101,7 +101,7 @@ jobs:
         echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin &&
         docker push iofog/controller:rc &&
         docker tag iofog/controller:rc iofog/controller:rc-$VERSION &&
-        docker push iofog/controller:rc-$VERSION
+        docker push iofog/controller:rc-$VERSION || travis_terminate 1
   - stage: release_deploy
     before_install:
       - sudo apt-get install sshpass
@@ -117,8 +117,8 @@ jobs:
       on:
         branch: master
     after_deploy:
+      - sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP "iofog-controller stop"
       - |
-        sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP "iofog-controller stop" &&
         sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP \
           "npm update --unsafe-perm -g iofogcontroller; iofog-controller start" &&
         export VERSION=`npm view iofogcontroller version` &&
@@ -126,4 +126,4 @@ jobs:
         echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin &&
         docker push iofog/controller:latest &&
         docker tag iofog/controller:latest iofog/controller:$VERSION &&
-        docker push iofog/controller:$VERSION
+        docker push iofog/controller:$VERSION || travis_terminate 1

From c05b08ec07c67bd5f0b786e92cec6e62d8d8545e Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 17:11:31 +1200
Subject: [PATCH 10/31] add azure ci

---
 azure-pipelines.yml | 117 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 azure-pipelines.yml

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 000000000..519194bda
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,117 @@
+trigger:
+  tags:
+    include:
+      - v.*
+  branches:
+    include:
+      - develop
+      - master
+  paths:
+    exclude:
+      - README.md
+
+pr:
+  - master
+
+pool:
+  vmImage: 'Ubuntu-16.04'
+
+variables:
+  repository: 'focal-freedom-236620/rushcontroller'
+  type: $(Build.SourceBranchName)
+  commit: $(Build.SourceVersion)
+  sem_tag:
+  controller_tar:
+
+steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: '8.x'
+    displayName: 'Install Node.js'
+
+  - script: |
+      npm install
+      npm run build
+    displayName: 'npm install and build'
+
+  - script: |
+      npm test
+    displayName: 'unit tests'
+
+  - script: |
+      echo "npm test"
+    displayName: 'integration tests'
+
+  - script: |
+      mrdir artefact && cd artefact
+      npm pack
+      cd ..
+    displayName: 'npm pack'
+
+  - bash: |
+      echo checking pack file exists..
+      controller_tar=$(ls iofogcontroller-*.tgz)
+      echo $controller_tar
+      '##vso[task.setvariable variable=controller_tar]$controller_tar'
+    displayName: 'controller_tar check'
+    name: setcontrollertarvarStep
+
+  - bash: |
+      echo current tag..
+      sem_tag=$(type)
+      sem_tag=${sem_tag:0:3}
+      '##vso[task.setvariable variable=sem_tag]$sem_tag'
+    displayName: 'tag'
+    name: setvarStep
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
+
+  - task: Docker@2
+    displayName: 'build and tag dev docker'
+    inputs:
+      containerRegistry: 'Edgeworx GCP'
+      repository: $(repository)
+      command: 'buildAndPush'
+      Dockerfile: 'Dockerfile.dev'
+      arguments: $(controller_tar)
+      tags: |
+        $(type)
+        $(commit)
+        latest
+        $(sem_tag)
+
+  - task: Docker@2
+    displayName: 'build and tag rel docker'
+    inputs:
+      containerRegistry: 'Edgeworx GCP'
+      repository: $(repository)
+      command: 'buildAndPush'
+      Dockerfile: 'Dockerfile.rel'
+      arguments: FILENAME=$(ls iofogcontroller-*.tgz)
+      tags: |
+        $(type)
+        $(commit)
+        latest
+        $(sem_tag)
+
+  - script: |
+      echo "npm test"
+    displayName: 'api tests'
+
+#  - task: Npm@1
+#    displayName: 'publish npm package'
+#    inputs:
+#      command: 'publish'
+#      publishRegistry: 'useFeed'
+#      publishFeed: 'edgeworx'
+
+  - task: CopyFiles@2
+    inputs:
+      SourceFolder: 'artefact'
+      #contents: '**'
+      TargetFolder: $(Build.ArtifactStagingDirectory)
+      OverWrite: true
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+      ArtifactName: 'controller'

From 71d6a97deec219d807b2ea70206bab3fdb148a80 Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 17:20:10 +1200
Subject: [PATCH 11/31] fix the bash

---
 azure-pipelines.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 519194bda..2e203f104 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -52,7 +52,8 @@ steps:
       echo checking pack file exists..
       controller_tar=$(ls iofogcontroller-*.tgz)
       echo $controller_tar
-      '##vso[task.setvariable variable=controller_tar]$controller_tar'
+      echo test
+      echo '##vso[task.setvariable variable=controller_tar]$controller_tar'
     displayName: 'controller_tar check'
     name: setcontrollertarvarStep
 
@@ -60,7 +61,7 @@ steps:
       echo current tag..
       sem_tag=$(type)
       sem_tag=${sem_tag:0:3}
-      '##vso[task.setvariable variable=sem_tag]$sem_tag'
+      echo '##vso[task.setvariable variable=sem_tag]$sem_tag'
     displayName: 'tag'
     name: setvarStep
     condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')

From 12001cdab6e0e0f38f38c9eefe1d435f00aa1a9e Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 17:39:59 +1200
Subject: [PATCH 12/31] docker build push

---
 azure-pipelines.yml | 53 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 13 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2e203f104..ef06eafb4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -49,31 +49,44 @@ steps:
     displayName: 'npm pack'
 
   - bash: |
-      echo checking pack file exists..
-      controller_tar=$(ls iofogcontroller-*.tgz)
       echo $controller_tar
-      echo test
-      echo '##vso[task.setvariable variable=controller_tar]$controller_tar'
+      echo checking pack file exists..
+      tar=$(ls iofogcontroller-*.tgz)
+      echo $tar
+      echo '##vso[task.setvariable variable=controller_tar]$tar'
     displayName: 'controller_tar check'
     name: setcontrollertarvarStep
 
   - bash: |
       echo current tag..
-      sem_tag=$(type)
-      sem_tag=${sem_tag:0:3}
-      echo '##vso[task.setvariable variable=sem_tag]$sem_tag'
+      tag=$(type)
+      tag=${tag:0:4}
+      echo '##vso[task.setvariable variable=sem_tag]$tag'
     displayName: 'tag'
     name: setvarStep
     condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
 
   - task: Docker@2
-    displayName: 'build and tag dev docker'
+    displayName: 'build dev docker'
+    inputs:
+      containerRegistry: 'Edgeworx GCP'
+      repository: $(repository)
+      command: 'build'
+      Dockerfile: 'Dockerfile.dev'
+      arguments: FILENAME=$($controller_tar)
+      tags: |
+        $(type)
+        $(commit)
+        latest
+        $(sem_tag)
+
+  - task: Docker@2
+    displayName: 'push dev docker'
     inputs:
       containerRegistry: 'Edgeworx GCP'
       repository: $(repository)
-      command: 'buildAndPush'
+      command: 'push'
       Dockerfile: 'Dockerfile.dev'
-      arguments: $(controller_tar)
       tags: |
         $(type)
         $(commit)
@@ -81,19 +94,33 @@ steps:
         $(sem_tag)
 
   - task: Docker@2
-    displayName: 'build and tag rel docker'
+    displayName: 'build rel docker'
     inputs:
       containerRegistry: 'Edgeworx GCP'
       repository: $(repository)
-      command: 'buildAndPush'
+      command: 'build'
       Dockerfile: 'Dockerfile.rel'
-      arguments: FILENAME=$(ls iofogcontroller-*.tgz)
+      arguments: FILENAME=$($controller_tar)
       tags: |
         $(type)
         $(commit)
         latest
         $(sem_tag)
 
+  - task: Docker@2
+    displayName: 'push rel docker'
+    inputs:
+      containerRegistry: 'Edgeworx GCP'
+      repository: $(repository)
+      command: 'push'
+      Dockerfile: 'Dockerfile.rel'
+      tags: |
+        $(type)
+        $(commit)
+        latest
+        $(sem_tag)
+
+
   - script: |
       echo "npm test"
     displayName: 'api tests'

From ff5f9ebebf553a5e130c4a409ffc4d122fe91be6 Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 17:50:20 +1200
Subject: [PATCH 13/31] typo

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ef06eafb4..d7f84a671 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -73,7 +73,7 @@ steps:
       repository: $(repository)
       command: 'build'
       Dockerfile: 'Dockerfile.dev'
-      arguments: FILENAME=$($controller_tar)
+      arguments: FILENAME=$(controller_tar)
       tags: |
         $(type)
         $(commit)
@@ -100,7 +100,7 @@ steps:
       repository: $(repository)
       command: 'build'
       Dockerfile: 'Dockerfile.rel'
-      arguments: FILENAME=$($controller_tar)
+      arguments: FILENAME=$(controller_tar)
       tags: |
         $(type)
         $(commit)

From 3c5dc1eeb1694d129a3b14cafdb0f7c5322f4498 Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 17:50:40 +1200
Subject: [PATCH 14/31] comment tests

---
 azure-pipelines.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d7f84a671..b72d11dfb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -34,9 +34,9 @@ steps:
       npm run build
     displayName: 'npm install and build'
 
-  - script: |
-      npm test
-    displayName: 'unit tests'
+#  - script: |
+#      npm test
+#    displayName: 'unit tests'
 
   - script: |
       echo "npm test"

From d77c0c02449b3a9abef30868dc3107d088963865 Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 18:07:02 +1200
Subject: [PATCH 15/31] test

---
 azure-pipelines.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b72d11dfb..1f0be4c6f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -53,7 +53,8 @@ steps:
       echo checking pack file exists..
       tar=$(ls iofogcontroller-*.tgz)
       echo $tar
-      echo '##vso[task.setvariable variable=controller_tar]$tar'
+      echo '$(tar)'
+      echo "##vso[task.setvariable variable=controller_tar]$tar"
     displayName: 'controller_tar check'
     name: setcontrollertarvarStep
 
@@ -61,7 +62,7 @@ steps:
       echo current tag..
       tag=$(type)
       tag=${tag:0:4}
-      echo '##vso[task.setvariable variable=sem_tag]$tag'
+      echo "##vso[task.setvariable variable=sem_tag]$tag"
     displayName: 'tag'
     name: setvarStep
     condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')

From bf25da4f5d6a9924f165265b1c72b5594b6ebadd Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 18:11:49 +1200
Subject: [PATCH 16/31] work now

---
 azure-pipelines.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1f0be4c6f..651e375d5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -53,7 +53,6 @@ steps:
       echo checking pack file exists..
       tar=$(ls iofogcontroller-*.tgz)
       echo $tar
-      echo '$(tar)'
       echo "##vso[task.setvariable variable=controller_tar]$tar"
     displayName: 'controller_tar check'
     name: setcontrollertarvarStep
@@ -74,7 +73,7 @@ steps:
       repository: $(repository)
       command: 'build'
       Dockerfile: 'Dockerfile.dev'
-      arguments: FILENAME=$(controller_tar)
+      arguments: --build-arg FILENAME=$(controller_tar)
       tags: |
         $(type)
         $(commit)
@@ -101,7 +100,7 @@ steps:
       repository: $(repository)
       command: 'build'
       Dockerfile: 'Dockerfile.rel'
-      arguments: FILENAME=$(controller_tar)
+      arguments: --build-arg FILENAME=$(controller_tar)
       tags: |
         $(type)
         $(commit)

From e1885fd03f0e2f9a64de7e8fc04293d6a6656f99 Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 18:20:39 +1200
Subject: [PATCH 17/31] work now.

---
 Dockerfile.dev      |  4 ++--
 Dockerfile.rel      |  4 ++--
 azure-pipelines.yml | 17 ++++++++---------
 package.json        |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Dockerfile.dev b/Dockerfile.dev
index 7ca90a17d..3de02280d 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM iofog/node:alpine
+FROM iofog/node-alpine-x86:8.16.0
 
 ARG FILENAME
 ENV NODE_ENV=development
@@ -10,4 +10,4 @@ RUN npm i --unsafe-perm -g /tmp/${FILENAME} && \
   iofog-controller config dev-mode --on && \
   echo "iofog-controller start && tail -f /dev/null" >> /start.sh
 
-CMD [ "sh", "/start.sh" ]
\ No newline at end of file
+CMD [ "sh", "/start.sh" ]
diff --git a/Dockerfile.rel b/Dockerfile.rel
index 29a102d97..86e3fbe52 100644
--- a/Dockerfile.rel
+++ b/Dockerfile.rel
@@ -1,4 +1,4 @@
-FROM iofog/node:alpine
+FROM iofog/node-alpine-x86:8.16.0
 
 ARG FILENAME
 
@@ -8,4 +8,4 @@ RUN npm i --unsafe-perm -g /tmp/${FILENAME} && \
   rm /tmp/${FILENAME} && \
   echo "iofog-controller start && tail -f /dev/null" >> /start.sh
 
-CMD [ "sh", "/start.sh" ]
\ No newline at end of file
+CMD [ "sh", "/start.sh" ]
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 651e375d5..f989782a0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -43,7 +43,7 @@ steps:
     displayName: 'integration tests'
 
   - script: |
-      mrdir artefact && cd artefact
+      mkdir artefact && cd artefact
       npm pack
       cd ..
     displayName: 'npm pack'
@@ -125,17 +125,9 @@ steps:
       echo "npm test"
     displayName: 'api tests'
 
-#  - task: Npm@1
-#    displayName: 'publish npm package'
-#    inputs:
-#      command: 'publish'
-#      publishRegistry: 'useFeed'
-#      publishFeed: 'edgeworx'
-
   - task: CopyFiles@2
     inputs:
       SourceFolder: 'artefact'
-      #contents: '**'
       TargetFolder: $(Build.ArtifactStagingDirectory)
       OverWrite: true
 
@@ -143,3 +135,10 @@ steps:
     inputs:
       PathtoPublish: '$(Build.ArtifactStagingDirectory)'
       ArtifactName: 'controller'
+
+  - task: Npm@1
+    displayName: 'publish npm package'
+    inputs:
+      command: 'publish'
+      publishRegistry: 'useFeed'
+      publishFeed: 'edgeworx'
diff --git a/package.json b/package.json
index b1cec6abd..602a85e74 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "iofogcontroller",
-	"version": "1.0.37",
+	"version": "1.0.38",
 	"description": "ioFog Controller project for Eclipse IoFog @ iofog.org \\nCopyright (c) 2018 Edgeworx, Inc.",
 	"main": "./src/main.js",
 	"author": "Saeid Baghbidi",

From d0508d5e5178114111f323be6679ef800b36a3f3 Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 18:25:32 +1200
Subject: [PATCH 18/31] now what!

---
 azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f989782a0..d8a40bc8b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -46,6 +46,7 @@ steps:
       mkdir artefact && cd artefact
       npm pack
       cd ..
+      ls
     displayName: 'npm pack'
 
   - bash: |

From b5afdaad035751380e26f29e57db03f04c777140 Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 18:36:37 +1200
Subject: [PATCH 19/31] test

---
 azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d8a40bc8b..44568b233 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -46,6 +46,7 @@ steps:
       mkdir artefact && cd artefact
       npm pack
       cd ..
+      pwd
       ls
     displayName: 'npm pack'
 

From 46e32ca8b9be42224b67df1b4e4a046436f81711 Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 18:46:22 +1200
Subject: [PATCH 20/31] should work now

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 44568b233..aa8902469 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -43,9 +43,9 @@ steps:
     displayName: 'integration tests'
 
   - script: |
-      mkdir artefact && cd artefact
       npm pack
-      cd ..
+      mkdir artefact
+      mv iofogcontroller-*.tgz artefact/
       pwd
       ls
     displayName: 'npm pack'

From 3b35139b16060988c3d3a24e4e182c1972183736 Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 18:47:36 +1200
Subject: [PATCH 21/31] rm

---
 Dockerfile.dev | 2 +-
 Dockerfile.rel | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.dev b/Dockerfile.dev
index 3de02280d..d88df7ef7 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -6,7 +6,7 @@ ENV NODE_ENV=development
 COPY ${FILENAME} /tmp
 
 RUN npm i --unsafe-perm -g /tmp/${FILENAME} && \
-  rm /tmp/${FILENAME} && \
+  rm -rf /tmp/${FILENAME} && \
   iofog-controller config dev-mode --on && \
   echo "iofog-controller start && tail -f /dev/null" >> /start.sh
 
diff --git a/Dockerfile.rel b/Dockerfile.rel
index 86e3fbe52..6d35e464b 100644
--- a/Dockerfile.rel
+++ b/Dockerfile.rel
@@ -5,7 +5,7 @@ ARG FILENAME
 COPY ${FILENAME} /tmp
 
 RUN npm i --unsafe-perm -g /tmp/${FILENAME} && \
-  rm /tmp/${FILENAME} && \
+  rm -rf /tmp/${FILENAME} && \
   echo "iofog-controller start && tail -f /dev/null" >> /start.sh
 
 CMD [ "sh", "/start.sh" ]

From b49a8b8504c215fa922ac48828ff58539c48b5ef Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 18:54:04 +1200
Subject: [PATCH 22/31] uhoh

---
 azure-pipelines.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index aa8902469..5ce9901f6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -60,10 +60,12 @@ steps:
     name: setcontrollertarvarStep
 
   - bash: |
+      cd artefact
       echo current tag..
       tag=$(type)
       tag=${tag:0:4}
       echo "##vso[task.setvariable variable=sem_tag]$tag"
+      cd ..
     displayName: 'tag'
     name: setvarStep
     condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')

From 14015233d0b2d758eef192b409f6e3426bccdef7 Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 18:59:18 +1200
Subject: [PATCH 23/31] annoyed

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5ce9901f6..4cb125368 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -51,21 +51,21 @@ steps:
     displayName: 'npm pack'
 
   - bash: |
+      cd artefact
       echo $controller_tar
       echo checking pack file exists..
       tar=$(ls iofogcontroller-*.tgz)
       echo $tar
       echo "##vso[task.setvariable variable=controller_tar]$tar"
+      cd ..
     displayName: 'controller_tar check'
     name: setcontrollertarvarStep
 
   - bash: |
-      cd artefact
       echo current tag..
       tag=$(type)
       tag=${tag:0:4}
       echo "##vso[task.setvariable variable=sem_tag]$tag"
-      cd ..
     displayName: 'tag'
     name: setvarStep
     condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')

From d8e6bdeb9d13f1c5949a2e5e431733f5a53ba286 Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 19:09:34 +1200
Subject: [PATCH 24/31] missing

---
 azure-pipelines.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4cb125368..dc180320b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -51,13 +51,10 @@ steps:
     displayName: 'npm pack'
 
   - bash: |
-      cd artefact
-      echo $controller_tar
       echo checking pack file exists..
-      tar=$(ls iofogcontroller-*.tgz)
+      tar=$(ls artefact/iofogcontroller-*.tgz)
       echo $tar
       echo "##vso[task.setvariable variable=controller_tar]$tar"
-      cd ..
     displayName: 'controller_tar check'
     name: setcontrollertarvarStep
 

From f522356e638cba05510552dc3c72ce3c4af61149 Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 19:17:46 +1200
Subject: [PATCH 25/31] artefact drama

---
 azure-pipelines.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index dc180320b..61cab8259 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -44,15 +44,13 @@ steps:
 
   - script: |
       npm pack
-      mkdir artefact
-      mv iofogcontroller-*.tgz artefact/
       pwd
       ls
     displayName: 'npm pack'
 
   - bash: |
       echo checking pack file exists..
-      tar=$(ls artefact/iofogcontroller-*.tgz)
+      tar=$(ls iofogcontroller-*.tgz)
       echo $tar
       echo "##vso[task.setvariable variable=controller_tar]$tar"
     displayName: 'controller_tar check'
@@ -128,7 +126,7 @@ steps:
 
   - task: CopyFiles@2
     inputs:
-      SourceFolder: 'artefact'
+      SourceFolder: $(System.DefaultWorkingDirectory)
       TargetFolder: $(Build.ArtifactStagingDirectory)
       OverWrite: true
 

From 9b8f71d61e8dc41b6a27151c767393fa95a1886d Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 19:34:42 +1200
Subject: [PATCH 26/31] tgz

---
 azure-pipelines.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 61cab8259..682165e29 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -128,6 +128,8 @@ steps:
     inputs:
       SourceFolder: $(System.DefaultWorkingDirectory)
       TargetFolder: $(Build.ArtifactStagingDirectory)
+      Contents: |
+        *.tgz
       OverWrite: true
 
   - task: PublishBuildArtifacts@1

From bf63bfb2edc777cf8dc3a9405e301686a68ef25f Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 22:09:01 +1200
Subject: [PATCH 27/31] tagging

---
 azure-pipelines.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 682165e29..4bf26499d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -17,7 +17,7 @@ pool:
   vmImage: 'Ubuntu-16.04'
 
 variables:
-  repository: 'focal-freedom-236620/rushcontroller'
+  repository: 'focal-freedom-236620/controller'
   type: $(Build.SourceBranchName)
   commit: $(Build.SourceVersion)
   sem_tag:
@@ -34,9 +34,9 @@ steps:
       npm run build
     displayName: 'npm install and build'
 
-#  - script: |
-#      npm test
-#    displayName: 'unit tests'
+  - script: |
+      npm test
+    displayName: 'unit tests'
 
   - script: |
       echo "npm test"
@@ -74,6 +74,7 @@ steps:
       Dockerfile: 'Dockerfile.dev'
       arguments: --build-arg FILENAME=$(controller_tar)
       tags: |
+        dev
         $(type)
         $(commit)
         latest
@@ -87,6 +88,7 @@ steps:
       command: 'push'
       Dockerfile: 'Dockerfile.dev'
       tags: |
+        dev
         $(type)
         $(commit)
         latest
@@ -101,6 +103,7 @@ steps:
       Dockerfile: 'Dockerfile.rel'
       arguments: --build-arg FILENAME=$(controller_tar)
       tags: |
+        rel
         $(type)
         $(commit)
         latest
@@ -114,6 +117,7 @@ steps:
       command: 'push'
       Dockerfile: 'Dockerfile.rel'
       tags: |
+        rel
         $(type)
         $(commit)
         latest

From 30dae326526542e257c06758d864a52164b54c6c Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Wed, 1 May 2019 22:24:39 +1200
Subject: [PATCH 28/31] fix tags

---
 azure-pipelines.yml | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4bf26499d..30c175be2 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -74,11 +74,10 @@ steps:
       Dockerfile: 'Dockerfile.dev'
       arguments: --build-arg FILENAME=$(controller_tar)
       tags: |
-        dev
-        $(type)
-        $(commit)
-        latest
-        $(sem_tag)
+        dev-$(commit)
+        dev-$(type)
+        dev-latest
+        dev-$(sem_tag)
 
   - task: Docker@2
     displayName: 'push dev docker'
@@ -88,11 +87,10 @@ steps:
       command: 'push'
       Dockerfile: 'Dockerfile.dev'
       tags: |
-        dev
-        $(type)
-        $(commit)
-        latest
-        $(sem_tag)
+        dev-$(commit)
+        dev-$(type)
+        dev-latest
+        dev-$(sem_tag)
 
   - task: Docker@2
     displayName: 'build rel docker'
@@ -103,11 +101,10 @@ steps:
       Dockerfile: 'Dockerfile.rel'
       arguments: --build-arg FILENAME=$(controller_tar)
       tags: |
-        rel
-        $(type)
-        $(commit)
-        latest
-        $(sem_tag)
+        rel-$(commit)
+        rel-$(type)
+        rel-latest
+        rel-$(sem_tag)
 
   - task: Docker@2
     displayName: 'push rel docker'
@@ -117,12 +114,10 @@ steps:
       command: 'push'
       Dockerfile: 'Dockerfile.rel'
       tags: |
-        rel
-        $(type)
-        $(commit)
-        latest
-        $(sem_tag)
-
+        rel-$(commit)
+        rel-$(type)
+        rel-latest
+        rel-$(sem_tag)
 
   - script: |
       echo "npm test"

From 903580590098d91fe0c8896c1bcff042a95d2e28 Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Thu, 2 May 2019 15:28:23 +1200
Subject: [PATCH 29/31] comment out npm publish

---
 azure-pipelines.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 30c175be2..91b648750 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -136,9 +136,9 @@ steps:
       PathtoPublish: '$(Build.ArtifactStagingDirectory)'
       ArtifactName: 'controller'
 
-  - task: Npm@1
-    displayName: 'publish npm package'
-    inputs:
-      command: 'publish'
-      publishRegistry: 'useFeed'
-      publishFeed: 'edgeworx'
+#  - task: Npm@1
+#    displayName: 'publish npm package'
+#    inputs:
+#      command: 'publish'
+#      publishRegistry: 'useFeed'
+#      publishFeed: 'edgeworx'

From bf9088880ca90900160c3b28c45ec063f991da87 Mon Sep 17 00:00:00 2001
From: Rashmi Modhwadia <rashmi.modhwadia@gmail.com>
Date: Thu, 2 May 2019 16:50:04 +1200
Subject: [PATCH 30/31] remove tag

---
 azure-pipelines.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 91b648750..f4ef93b9f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -20,7 +20,6 @@ variables:
   repository: 'focal-freedom-236620/controller'
   type: $(Build.SourceBranchName)
   commit: $(Build.SourceVersion)
-  sem_tag:
   controller_tar:
 
 steps:
@@ -56,15 +55,6 @@ steps:
     displayName: 'controller_tar check'
     name: setcontrollertarvarStep
 
-  - bash: |
-      echo current tag..
-      tag=$(type)
-      tag=${tag:0:4}
-      echo "##vso[task.setvariable variable=sem_tag]$tag"
-    displayName: 'tag'
-    name: setvarStep
-    condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
-
   - task: Docker@2
     displayName: 'build dev docker'
     inputs:
@@ -77,7 +67,6 @@ steps:
         dev-$(commit)
         dev-$(type)
         dev-latest
-        dev-$(sem_tag)
 
   - task: Docker@2
     displayName: 'push dev docker'
@@ -90,7 +79,6 @@ steps:
         dev-$(commit)
         dev-$(type)
         dev-latest
-        dev-$(sem_tag)
 
   - task: Docker@2
     displayName: 'build rel docker'
@@ -104,7 +92,6 @@ steps:
         rel-$(commit)
         rel-$(type)
         rel-latest
-        rel-$(sem_tag)
 
   - task: Docker@2
     displayName: 'push rel docker'
@@ -117,7 +104,6 @@ steps:
         rel-$(commit)
         rel-$(type)
         rel-latest
-        rel-$(sem_tag)
 
   - script: |
       echo "npm test"

From 351979e54b6dbce1e8f8605de7a28a5e306b6f62 Mon Sep 17 00:00:00 2001
From: Saeid Rezaei Baghbidi <srbaghbidi@yahoo.com>
Date: Thu, 2 May 2019 16:24:53 -0700
Subject: [PATCH 31/31] Remove JRC and Attinad deployments

---
 .travis.yml | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8b55ab4f5..bba7c5bcf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,10 +44,6 @@ jobs:
     after_deploy:
       - |
         sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP \
-          "iofog-controller stop; rm -R /iofogcontroller*" &&
-        sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
-          "iofog-controller stop; rm -R /iofogcontroller*" &&
-        sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
           "iofog-controller stop; rm -R /iofogcontroller*"
 
       - |
@@ -56,22 +52,6 @@ jobs:
           $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP:/$FILENAME &&
         sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP \
           "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" &&
-        sshpass -p $JRC_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME \
-          $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP:/$FILENAME &&
-        sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
-          "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" &&
-        sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
-          "iofog-controller user add -f John -l Doe -e user@domain.com -p ${JRC_MACHINE_PASSWORD}" &&
-        sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
-          "iofog-controller connector add -n connector -d localhost -i 127.0.0.1 -H" &&
-        sshpass -p $ATTINAD_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME \
-          $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP:/$FILENAME && 
-        sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
-          "npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" &&
-        sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
-          "iofog-controller user add -f John -l Doe -e user@domain.com -p ${ATTINAD_MACHINE_PASSWORD}" &&
-        sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
-          "iofog-controller connector add -n connector -d localhost -i 127.0.0.1 -H" &&
         docker build -t iofog/controller-develop:latest --build-arg FILENAME=$FILENAME . -f Dockerfile.dev && 
         echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin &&
         docker push iofog/controller-develop:latest &&