Cico planner

.dockerignore

@@ -1,3 +1,8 @@
 node_modules
 *~
 *.swp
+dist
+runtime/node_modules
+runtime/*~
+runtime/*.swp
+runtime/dist

Dockerfile

@@ -24,7 +24,7 @@ ENV NODE_VERSION 8.3.0
 
 RUN yum -y update && \
     yum install -y bzip2 fontconfig tar java-1.8.0-openjdk nmap-ncat psmisc gtk3 git \
-      python-setuptools xorg-x11-xauth wget unzip which \
+      python-setuptools xorg-x11-xauth wget unzip which gcc-c++ \
       xfonts-100dpi libXfont GConf2 \
       xorg-x11-fonts-75dpi xfonts-scalable xfonts-cyrillic \
       ipa-gothic-fonts xorg-x11-utils xorg-x11-fonts-Type1 xorg-x11-fonts-misc && \
@@ -47,12 +47,10 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-
 #  && yum install -y firefox \
 #  && npm install -g karma-firefox-launcher
 
-RUN npm install -g jasmine-node protractor
-
 COPY runtime/tests/google-chrome.repo /etc/yum.repos.d/google-chrome.repo
+
 RUN yum install -y google-chrome-stable
 
-ENV DISPLAY=:99
 ENV FABRIC8_USER_NAME=fabric8
 
 RUN useradd --user-group --create-home --shell /bin/false ${FABRIC8_USER_NAME}
@@ -64,14 +62,3 @@ RUN mkdir $WORKSPACE
 COPY . $WORKSPACE
 
 WORKDIR $WORKSPACE/
-
-RUN npm install \
- && npm run build \
- && cd runtime \
- && npm install \
- && npm link ../dist
-
-VOLUME /dist
-EXPOSE 8080
-
-CMD cd /home/fabric8/fabric8-planner/runtime ; npm start

cico_run_tests.sh

@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# This file is supposed to be executed by CICO build (ci.centos.org/view/Devtools/)
+#   1. Run tests for fabric8-planner
+#   2. Create snapshot with fabric8-ui's master and fabric8-planner's current changes
+
+# Show command before executing
+set -x
+
+# Exit on error
+set -e
+
+# Source environment variables of the jenkins slave
+# that might interest this worker.
+if [ -e "jenkins-env" ]; then
+  cat jenkins-env \
+    | grep -E "(JENKINS_URL|DEVSHIFT_USERNAME|DEVSHIFT_PASSWORD|GIT_BRANCH|GIT_COMMIT|BUILD_NUMBER|ghprbSourceBranch|ghprbActualCommit|BUILD_URL|ghprbPullId)=" \
+    | sed 's/^/export /g' \
+    > /tmp/jenkins-env
+  source /tmp/jenkins-env
+fi
+
+# We need to disable selinux for now, XXX
+/usr/sbin/setenforce 0
+
+# Get all the deps in
+yum -y install docker
+service docker start
+
+# Build builder image
+cp /tmp/jenkins-env .
+
+mkdir -p fabric8-ui-dist
+# Build fabric8-planner image
+docker build -t fabric8-planner-builder .
+# User root is required to run webdriver-manager update.
+# This shouldn't be a problem for CI containers
+# Chrome crashes on low size of /dev/shm. We need the --shm-size=256m flag.
+CID=$(docker run --detach=true \
+    --shm-size=256m \
+    -u $(shell id -u $(USER)):$(shell id -g $(USER)) \
+    -v $(pwd)/fabric8-ui-dist:/home/fabric8/fabric8-planner/fabric8-ui-dist:Z \
+    --cap-add=SYS_ADMIN \
+    -t fabric8-planner-builder)
+
+
+# Build fabric8-planner
+docker exec $CID npm install
+docker exec $CID npm run build
+
+# Run unit tests
+docker exec $CID npm run tests -- --unit
+
+## Exec functional tests
+docker exec $CID bash -c 'cd runtime; npm install'
+docker exec $CID bash -c 'DEBUG=true HEADLESS_MODE=true WEBDRIVER_VERSION=2.37 ./scripts/run-functests.sh'
+
+# Following steps will create a snapshot for testing
+
+# Build and integrate planner with fabric8-ui
+docker exec $CID npm pack dist/
+docker exec $CID git clone https://github.com/fabric8-ui/fabric8-ui.git
+docker exec $CID bash -c 'cd fabric8-ui; npm install'
+docker exec $CID bash -c 'cd fabric8-ui && npm install ../*0.0.0-development.tgz'
+docker exec $CID bash -c '''
+    export FABRIC8_WIT_API_URL="https://api.prod-preview.openshift.io/api/"
+    export FABRIC8_RECOMMENDER_API_URL="https://recommender.prod-preview.api.openshift.io"
+    export FABRIC8_FORGE_API_URL="https://forge.api.prod-preview.openshift.io"
+    export FABRIC8_SSO_API_URL="https://sso.prod-preview.openshift.io/"
+    export FABRIC8_AUTH_API_URL="https://auth.prod-preview.openshift.io/api/"
+
+    export OPENSHIFT_CONSOLE_URL="https://console.free-stg.openshift.com/console/"
+    export WS_K8S_API_SERVER="f8osoproxy-test-dsaas-preview.b6ff.rh-idev.openshiftapps.com:443"
+    export FABRIC8_FEATURE_TOGGLES_API_URL="f8osoproxy-test-dsaas-preview.b6ff.rh-idev.openshiftapps.com:443" 
+
+    export PROXIED_K8S_API_SERVER="${WS_K8S_API_SERVER}"
+    export OAUTH_ISSUER="https://${WS_K8S_API_SERVER}"
+    export PROXY_PASS_URL="https://${WS_K8S_API_SERVER}"
+    export OAUTH_AUTHORIZE_URI="https://${WS_K8S_API_SERVER}/oauth/authorize"
+    export AUTH_LOGOUT_URI="https://${WS_K8S_API_SERVER}/connect/endsession?id_token={{id_token}}"
+
+    cd fabric8-ui && npm run build:prod
+'''
+# Copy dist and Dockerfile.deploy to host (via mounted dir)
+docker exec $CID bash -c 'cd fabric8-ui; cp -r dist/ /home/fabric8/fabric8-planner/fabric8-ui-dist/'
+docker exec $CID bash -c 'cd fabric8-ui; cp Dockerfile.deploy /home/fabric8/fabric8-planner/fabric8-ui-dist'
+
+REGISTRY="push.registry.devshift.net"
+
+# login first
+if [ -n "${DEVSHIFT_USERNAME}" -a -n "${DEVSHIFT_PASSWORD}" ]; then
+    docker login -u ${DEVSHIFT_USERNAME} -p ${DEVSHIFT_PASSWORD} ${REGISTRY}
+else
+    echo "Could not login, missing credentials for the registry"
+    exit 1
+fi
+
+# Build and push image
+# Following code is not tested on local(remove this comment when tested with cico)
+TAG="SNAPSHOT-PR-${ghprbPullId}"
+IMAGE_REPO="fabric8-ui/fabric8-planner"
+
+cd fabric8-ui-dist
+docker build -t fabric8-planner-snapshot -f Dockerfile.deploy .
+docker tag fabric8-planner-snapshot ${REGISTRY}/${IMAGE_REPO}:$TAG
+docker push ${REGISTRY}/${IMAGE_REPO}:${TAG}
+
+PULL_REGISTRY="registry.devshift.net"
+image_name="${PULL_REGISTRY}/${IMAGE_REPO}:${TAG}"
+echo "======= Snapshot can be created by running following command"
+echo "docker run -e PROXY_PASS_URL=\"https://api.free-stg.openshift.com\" -p 8080:8080 ${image_name}"
+echo "======="

scripts/run-functests.sh

@@ -117,11 +117,11 @@ main() {
   fi
 
   export BASE_URL="${BASE_URL:-http://localhost:$PLANNER_PORT}"
-
+  export WEBDRIVER_VERSION="${WEBDRIVER_VERSION:-2.33}"
   log.info "Entering $SCRIPT_DIR/../tests"
   cd $SCRIPT_DIR/../tests
   log.info "Running Functional Tests..."
-  ./run.sh 
+  ./run.sh
 
   clean_up
 }

src/tests/specs/smoke/smokeTest.spec.ts

@@ -58,6 +58,7 @@ describe('Planner Smoke Tests:', () => {
 
   it('Check WorkItem creator name and image is reflected', async () => {
     await planner.workItemList.clickWorkItem(c.workItemTitle1);
+    await planner.quickPreview.ready();
     expect(await planner.quickPreview.hasCreator(c.user1)).toBeTruthy();
     expect(await planner.quickPreview.hasCreatorAvatar(c.user_avatar)).toBeTruthy()
     await planner.quickPreview.close();

src/tests/specs/workItemTableTest.spec.ts

@@ -55,6 +55,7 @@ describe('Work Item datatable list', () => {
 
   it('work item should show updated title when switching from flat to tree view', async() => {
     await planner.header.clickShowTree();
+    await planner.workItemList.ready();
     await planner.workItemList.clickWorkItem(c.workItemTitle1);
     await planner.quickPreview.updateTitle(c.updatedWorkItem.title);
     expect(await planner.workItemList.hasWorkItem(c.updatedWorkItem.title)).toBeTruthy();

src/tests/ui/planner/workitem-quickpreview.ts

@@ -104,7 +104,9 @@ export class WorkItemQuickPreview extends ui.BaseElement {
     await this.closeButton.ready();
     await this.titleDiv.ready();
     await this.descriptionDiv.ready();
-    await this.linksToggleButton.ready();
+    // We do not have the link button in current planner
+    // Uncomment when workitem linking is implemented
+    // await this.linksToggleButton.ready();
     await this.commentsToggleButton.ready();
     support.debug('... check if WorkItem preview is Ready - OK');
   }

tests/package.json

@@ -11,8 +11,8 @@
   "license": "Apache 2",
   "scripts": {
     "tsc": "tsc",
-    "webdriver:update": "webdriver-manager update --versions.chrome 2.33",
-    "webdriver:start": "webdriver-manager start --versions.chrome 2.33",
+    "webdriver:update": "webdriver-manager update",
+    "webdriver:start": "webdriver-manager start",
     "protractor": "protractor tmp/protractor.conf.js",
     "test": "./run.sh"
   },

tests/run.sh

@@ -59,8 +59,8 @@ start_webdriver() {
   # Start selenium server just for this test run
   log.info "Starting Webdriver and Selenium..."
   log.info "Webdriver will log to:$GREEN $log_file"
-  npm run webdriver:update
-  npm run webdriver:start >> "$log_file" 2>&1 &
+  npm run webdriver:update -- --versions.chrome $WEBDRIVER_VERSION
+  npm run webdriver:start -- --versions.chrome $WEBDRIVER_VERSION >> "$log_file" 2>&1 &
   webdriver_pid=$!
 }