dgrove-oss closed pull request #72: Travis cleanup.
URL: https://github.com/apache/incubator-openwhisk-runtime-nodejs/pull/72
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/.travis.yml b/.travis.yml
index 2c6dfd3..4a14bb5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ before_install:
   - "./tools/travis/setup.sh"
 install: true
 script:
-  - "./tools/travis/build.sh && ./tools/travis/deploy.sh && 
./tools/travis/test.sh"
+  - "./tools/travis/build.sh && ./tools/travis/test.sh"
 deploy:
   - provider: script
     script: "./tools/travis/publish.sh openwhisk ${TRAVIS_TAG%@*} 
${TRAVIS_TAG##*@}"
@@ -41,7 +41,7 @@ deploy:
       all_branches: true
       repo: apache/incubator-openwhisk-runtime-nodejs
   - provider: script
-    script: "./tools/travis/publish.sh openwhisk 6 master && 
./tools/travis/publish.sh openwhisk 8 master"
+    script: "./tools/travis/publish.sh openwhisk 6 latest && 
./tools/travis/publish.sh openwhisk 8 latest"
     on:
       branch: master
       repo: apache/incubator-openwhisk-runtime-nodejs
diff --git a/ansible/environments/local/group_vars/all 
b/ansible/environments/local/group_vars/all
deleted file mode 100755
index 4e8454e..0000000
--- a/ansible/environments/local/group_vars/all
+++ /dev/null
@@ -1,51 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
-# license agreements; and to You under the Apache License, Version 2.0.
-
-whisk_version_name: local
-openwhisk_tmp_dir: "{{ lookup('env', 'OPENWHISK_TMP_DIR')|default('/tmp', 
true) }}"
-config_root_dir: "{{ openwhisk_tmp_dir }}/wskconf"
-whisk_logs_dir: "{{ openwhisk_tmp_dir }}/wsklogs"
-docker_registry: "docker.io/"
-docker_image_prefix: "openwhisk"
-docker_dns: ""
-runtimes_bypass_pull_for_local_images: true
-invoker_use_runc: "{{ ansible_distribution != 'MacOSX' }}"
-
-db_prefix: whisk_local_
-
-# Auto lookup to find the db credentials
-db_provider: "{{ lookup('ini', 'db_provider section=db_creds file={{ 
playbook_dir }}/db_local.ini') }}"
-db_username: "{{ lookup('ini', 'db_username section=db_creds file={{ 
playbook_dir }}/db_local.ini') }}"
-db_password: "{{ lookup('ini', 'db_password section=db_creds file={{ 
playbook_dir }}/db_local.ini') }}"
-db_protocol: "{{ lookup('ini', 'db_protocol section=db_creds file={{ 
playbook_dir }}/db_local.ini') }}"
-db_host: "{{ lookup('ini', 'db_host section=db_creds file={{ playbook_dir 
}}/db_local.ini') }}"
-db_port: "{{ lookup('ini', 'db_port section=db_creds file={{ playbook_dir 
}}/db_local.ini') }}"
-
-# API GW connection configuration
-apigw_auth_user: ""
-apigw_auth_pwd: ""
-apigw_host_v2: "http://{{ groups['apigateway']|first 
}}:{{apigateway.port.api}}/v2"
-
-invoker_allow_multiple_instances: true
-
-
-env_hosts_dir: "{{ playbook_dir }}/environments/local"
-
-skip_pull_runtimes: true
-runtimes_manifest:
-  runtimes:
-    nodejs:
-    - kind: "nodejs:6"
-      default: true
-      image:
-        name: "nodejs6action"
-      deprecated: false
-    - kind: "nodejs:8"
-      default: false
-      image:
-        name: "action-nodejs-v8"
-      deprecated: false
-  blackboxes:
-    - name: "dockerskeleton"
-
-controller_protocol: "http"
diff --git a/ansible/environments/local/hosts b/ansible/environments/local/hosts
deleted file mode 100644
index 4715e55..0000000
--- a/ansible/environments/local/hosts
+++ /dev/null
@@ -1,29 +0,0 @@
-; the first parameter in a host is the inventory_hostname
-
-; used for local actions only
-ansible ansible_connection=local
-
-[edge]
-172.17.0.1          ansible_host=172.17.0.1 ansible_connection=local
-
-[controllers]
-controller0         ansible_host=172.17.0.1 ansible_connection=local
-
-[kafkas]
-kafka0              ansible_host=172.17.0.1 ansible_connection=local
-
-[zookeepers:children]
-kafkas
-
-[invokers]
-invoker0            ansible_host=172.17.0.1 ansible_connection=local
-
-; db group is only used if db_provider is CouchDB
-[db]
-172.17.0.1          ansible_host=172.17.0.1 ansible_connection=local
-
-[redis]
-172.17.0.1          ansible_host=172.17.0.1 ansible_connection=local
-
-[apigateway]
-172.17.0.1          ansible_host=172.17.0.1 ansible_connection=local
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 13fb411..2d39fa9 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -27,10 +27,17 @@ UTILDIR="$ROOTDIR/../incubator-openwhisk-utilities"
 
 export OPENWHISK_HOME=$WHISKDIR
 
-# Run scancode using the ASF Release configuration
+# run scancode using the ASF Release configuration
 cd $UTILDIR
 scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR
 
+# Build OpenWhisk deps before we run tests
+cd $WHISKDIR
+TERM=dumb ./gradlew install
+# Mock file (works around bug upstream)
+echo "openwhisk.home=$WHISKDIR" > whisk.properties
+echo "vcap.services.file=" >> whisk.properties
+
 # Build runtime
 cd $ROOTDIR
 TERM=dumb ./gradlew \
diff --git a/tools/travis/deploy.sh b/tools/travis/deploy.sh
deleted file mode 100755
index 0618340..0000000
--- a/tools/travis/deploy.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-set -ex
-
-# Build script for Travis-CI.
-
-SCRIPTDIR=$(cd $(dirname "$0") && pwd)
-ROOTDIR="$SCRIPTDIR/../.."
-WHISKDIR="$ROOTDIR/../openwhisk"
-
-export OPENWHISK_HOME=$WHISKDIR
-
-# Pull core images
-docker pull openwhisk/controller
-docker pull openwhisk/invoker
-
-# Deploy OpenWhisk
-cd $WHISKDIR/ansible
-ANSIBLE_CMD="ansible-playbook -i ${ROOTDIR}/ansible/environments/local"
-$ANSIBLE_CMD setup.yml
-$ANSIBLE_CMD prereq.yml
-$ANSIBLE_CMD couchdb.yml
-$ANSIBLE_CMD initdb.yml
-$ANSIBLE_CMD wipe.yml
-$ANSIBLE_CMD openwhisk.yml
-
-docker images
-docker ps
-
-cat $WHISKDIR/whisk.properties
-curl -s -k https://172.17.0.1 | jq .
-curl -s -k https://172.17.0.1/api/v1 | jq .
-
-#Deployment
-WHISK_APIHOST="172.17.0.1"
-WHISK_AUTH=`cat ${WHISKDIR}/ansible/files/auth.guest`
-WHISK_CLI="${WHISKDIR}/bin/wsk -i"
-
-${WHISK_CLI} property set --apihost ${WHISK_APIHOST} --auth ${WHISK_AUTH}
-${WHISK_CLI} property get
diff --git a/tools/travis/test.sh b/tools/travis/test.sh
index c8973d7..a5b249d 100755
--- a/tools/travis/test.sh
+++ b/tools/travis/test.sh
@@ -25,15 +25,6 @@ ROOTDIR="$SCRIPTDIR/../.."
 WHISKDIR="$ROOTDIR/../openwhisk"
 
 export OPENWHISK_HOME=$WHISKDIR
-
-# Build OpenWhisk deps before we run tests
-cd ${OPENWHISK_HOME}
-TERM=dumb ./gradlew install
-
-
 cd ${ROOTDIR}
 TERM=dumb ./gradlew :tests:checkScalafmtAll
-TERM=dumb ./gradlew :tests:test --tests *NodeJs*Tests
-
-
-
+TERM=dumb ./gradlew :tests:test


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
[email protected]


With regards,
Apache Git Services

Reply via email to