dgrove-oss closed pull request #34: Travis cleanup. URL: https://github.com/apache/incubator-openwhisk-runtime-python/pull/34
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 4d92e08..5f63c29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,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##*@}" @@ -21,7 +21,7 @@ deploy: all_branches: true repo: apache/incubator-openwhisk-runtime-python - provider: script - script: "./tools/travis/publish.sh openwhisk 2 master && ./tools/travis/publish.sh openwhisk 3 master" + script: "./tools/travis/publish.sh openwhisk 2 latest && ./tools/travis/publish.sh openwhisk 3 latest" on: branch: master repo: apache/incubator-openwhisk-runtime-python diff --git a/ansible/environments/local/group_vars/all b/ansible/environments/local/group_vars/all deleted file mode 100755 index 671e1e3..0000000 --- a/ansible/environments/local/group_vars/all +++ /dev/null @@ -1,57 +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_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 - python: - - kind: "python" - image: - name: "python2action" - deprecated: false - - kind: "python:2" - default: true - image: - name: "python2action" - deprecated: false - - kind: "python:3" - image: - name: "python3action" - deprecated: false - blackboxes: - - name: "dockerskeleton" 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 40d6d7a..e3aa931 100755 --- a/tools/travis/build.sh +++ b/tools/travis/build.sh @@ -27,25 +27,17 @@ UTILDIR="$ROOTDIR/../incubator-openwhisk-utilities" export OPENWHISK_HOME=$WHISKDIR -IMAGE_PREFIX="testing" - # run scancode using the ASF Release configuration cd $UTILDIR scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR -# Build OpenWhisk +# Build OpenWhisk deps before we run tests cd $WHISKDIR - -#pull down images -docker pull openwhisk/controller -docker tag openwhisk/controller ${IMAGE_PREFIX}/controller -docker pull openwhisk/invoker -docker tag openwhisk/invoker ${IMAGE_PREFIX}/invoker -docker pull openwhisk/nodejs6action -docker tag openwhisk/nodejs6action ${IMAGE_PREFIX}/nodejs6action - 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 distDocker -PdockerImagePrefix=${IMAGE_PREFIX} +TERM=dumb ./gradlew distDocker diff --git a/tools/travis/deploy.sh b/tools/travis/deploy.sh deleted file mode 100755 index 58b0988..0000000 --- a/tools/travis/deploy.sh +++ /dev/null @@ -1,54 +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 - -IMAGE_PREFIX="testing" - -# Deploy OpenWhisk -cd $WHISKDIR/ansible -ANSIBLE_CMD="ansible-playbook -i ${ROOTDIR}/ansible/environments/local -e docker_image_prefix=${IMAGE_PREFIX}" -$ANSIBLE_CMD setup.yml -$ANSIBLE_CMD prereq.yml -$ANSIBLE_CMD couchdb.yml -$ANSIBLE_CMD initdb.yml -$ANSIBLE_CMD wipe.yml -$ANSIBLE_CMD openwhisk.yml -e cli_installation_mode=remote - -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 18004f4..a5b249d 100755 --- a/tools/travis/test.sh +++ b/tools/travis/test.sh @@ -25,10 +25,6 @@ ROOTDIR="$SCRIPTDIR/../.." WHISKDIR="$ROOTDIR/../openwhisk" export OPENWHISK_HOME=$WHISKDIR - cd ${ROOTDIR} TERM=dumb ./gradlew :tests:checkScalafmtAll -TERM=dumb ./gradlew :tests:test --tests *Python*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: us...@infra.apache.org With regards, Apache Git Services