commit a4a2df743b4fb8d5ad6ea0dc7b0a77520ecb785a
author Matteo Scandolo <matteo.scandolo@gmail.com> Thu Jun 15 17:59:02 2017 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Thu Jun 15 17:59:02 2017 -0700
tree 7ce96edaebbe8b88337eaf2b0b305a148668fbe3
parent 4b1e61df82e28bf0f1136a5f2e0378ac8cd80dbb

Updating jenkinsfile

Change-Id: I453725b6aa000526440ac0f46f04c91f129c6d11

Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
index d357afd..a8b7b99 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,11 +25,11 @@
                 stage 'Run Unit Tests'
                 sh 'npm test'
 
-                stage 'Build GUI docker container'
-                sh 'docker pull nginx'
-                sh 'docker tag nginx nginx:candidate'
-                sh 'docker build --no-cache -t xosproject/xos-gui .'
-                sh 'docker run -p 4000:4000 --net=host --name xos-gui -d xosproject/xos-gui'
+                // stage 'Build GUI docker container'
+                // sh 'docker pull nginx'
+                // sh 'docker tag nginx nginx:candidate'
+                // sh 'docker build --no-cache -t xosproject/xos-gui .'
+                // sh 'docker run -p 4000:4000 --net=host --name xos-gui -d xosproject/xos-gui'
             } catch (err) {
                 currentBuild.result = 'FAILURE'
                 step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'teo@onlab.us', sendToIndividuals: true])
@@ -42,18 +42,11 @@
        dir('orchestration/xos-gui') {
             try {
                 stage 'Run E2E Tests'
-                sh 'UI_URL=127.0.0.1:4000/spa/#' protractor conf/protractor.conf.js
+                sh 'UI_URL=127.0.0.1:4000/xos/#' protractor conf/protractor.conf.js
                 currentBuild.result = 'SUCCESS'
             } catch (err) {
                 currentBuild.result = 'FAILURE'
                 step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'teo@onlab.us', sendToIndividuals: true])
-            } finally {
-                stage 'Clean'
-                sh 'docker stop xos-gui'
-                sh 'docker rm xos-gui'
-                sh 'docker rmi -f xosproject/xos-gui:latest'
-                sh 'docker rmi -f nginx:candidate'
-                sh 'docker rmi -f nginx:latest'
             }
        }
        dir('build/platform-install') {

e2e/crud/crud.spec.js

diff --git a/e2e/crud/crud.spec.js b/e2e/crud/crud.spec.js
index f3660b4..ed53436 100644
--- a/e2e/crud/crud.spec.js
+++ b/e2e/crud/crud.spec.js
@@ -17,7 +17,7 @@
     });
     it('should have a table', () => {
       expect(page.tableRows.count()).toBe(2);
-      expect(page.tableColumn.count()).toBe(5);
+      expect(page.tableColumn.count()).toBe(4);
       expect(page.deleteBtn.count()).toBe(1); // per row
     });
 
@@ -35,7 +35,7 @@
         browser.get(`${config.url}/core/nodes/1`);
       });
       it('should have a form', () => {
-        expect(page.formInputs.count()).toBe(5);
+        expect(page.formInputs.count()).toBe(4);
         expect(page.formBtn.isPresent()).toBeTruthy();
       });