From commits-return-5254-archive-asf-public=cust-asf.ponee.io@openwhisk.apache.org Thu Jul 12 22:55:39 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 5EE08180676 for ; Thu, 12 Jul 2018 22:55:38 +0200 (CEST) Received: (qmail 51073 invoked by uid 500); 12 Jul 2018 20:55:37 -0000 Mailing-List: contact commits-help@openwhisk.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwhisk.apache.org Delivered-To: mailing list commits@openwhisk.apache.org Received: (qmail 51064 invoked by uid 99); 12 Jul 2018 20:55:37 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jul 2018 20:55:37 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id D855680768; Thu, 12 Jul 2018 20:55:36 +0000 (UTC) Date: Thu, 12 Jul 2018 20:55:36 +0000 To: "commits@openwhisk.apache.org" Subject: [incubator-openwhisk-runtime-docker] branch master updated: Remove unnecessary Travis setup. (#53) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153142893682.4014.213254723866413600@gitbox.apache.org> From: dgrove@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-openwhisk-runtime-docker X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 5132350297d5220968e90a5e9b19756c5daa5742 X-Git-Newrev: 6e43689018e86ae53dcfbac8c92faad906a74b93 X-Git-Rev: 6e43689018e86ae53dcfbac8c92faad906a74b93 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. dgrove pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-docker.git The following commit(s) were added to refs/heads/master by this push: new 6e43689 Remove unnecessary Travis setup. (#53) 6e43689 is described below commit 6e43689018e86ae53dcfbac8c92faad906a74b93 Author: rodric rabbah AuthorDate: Thu Jul 12 16:55:34 2018 -0400 Remove unnecessary Travis setup. (#53) * Travis cleanup * Tag master build as 'latest'. --- .travis.yml | 5 ++- ansible/environments/local/group_vars/all | 49 ---------------------------- ansible/environments/local/hosts | 29 ----------------- tools/travis/build.sh | 18 +++-------- tools/travis/deploy.sh | 54 ------------------------------- tools/travis/setup.sh | 1 + tools/travis/test.sh | 4 --- 7 files changed, 8 insertions(+), 152 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22b62f8..e84b80d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,7 @@ before_install: - "./tools/travis/setup.sh" install: true script: - - "./tools/travis/build.sh && ./tools/travis/build_sdk.sh && ./tools/travis/deploy.sh - && ./tools/travis/test.sh" + - "./tools/travis/build.sh && ./tools/travis/build_sdk.sh && ./tools/travis/test.sh" before_deploy: - "./tools/travis/rename_sdk.sh ${TRAVIS_TAG%@*} ${TRAVIS_TAG##*@}" deploy: @@ -33,7 +32,7 @@ deploy: condition: "${TRAVIS_TAG%@*} = dockerskeleton || ${TRAVIS_TAG%@*} = example" repo: apache/incubator-openwhisk-runtime-docker - provider: script - script: "./tools/travis/publish.sh openwhisk dockerskeleton master && ./tools/travis/publish.sh openwhisk example master" + script: "./tools/travis/publish.sh openwhisk dockerskeleton latest && ./tools/travis/publish.sh openwhisk example latest" on: branch: master repo: apache/incubator-openwhisk-runtime-docker diff --git a/ansible/environments/local/group_vars/all b/ansible/environments/local/group_vars/all deleted file mode 100755 index 12c319b..0000000 --- a/ansible/environments/local/group_vars/all +++ /dev/null @@ -1,49 +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 -config_root_dir: /tmp/wskconf -whisk_logs_dir: /tmp/wsklogs -docker_registry: "" -docker_dns: "" -bypass_pull_for_local_images: true - -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 - -# Set kafka configuration -kafka_heap: '512m' -kafka_topics_completed_retentionBytes: 104857600 -kafka_topics_completed_retentionMS: 300000 -kafka_topics_health_retentionBytes: 104857600 -kafka_topics_health_retentionMS: 300000 -kafka_topics_invoker_retentionBytes: 104857600 -kafka_topics_invoker_retentionMS: 300000 - -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 - 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 0b3f18f..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 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 861c042..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 - -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/setup.sh b/tools/travis/setup.sh index 3424cdb..af4a1e4 100755 --- a/tools/travis/setup.sh +++ b/tools/travis/setup.sh @@ -31,4 +31,5 @@ git clone https://github.com/apache/incubator-openwhisk-utilities.git # clone main openwhisk repo. for testing purposes git clone --depth=1 https://github.com/apache/incubator-openwhisk.git openwhisk cd openwhisk + ./tools/travis/setup.sh diff --git a/tools/travis/test.sh b/tools/travis/test.sh index 05d080e..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 - - -