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-php.git
commit 9a1999a641df5b148d53e0289eee897c819a2075 Author: Rodric Rabbah <[email protected]> AuthorDate: Mon Jul 9 15:34:30 2018 -0400 Remove unnecessary Travis steps. --- .travis.yml | 2 +- .../Php71ActionContainerTests.scala | 3 ++ .../Php7ActionContainerTests.scala | 6 +-- tools/travis/build.sh | 18 ++------ tools/travis/deploy.sh | 54 ---------------------- tools/travis/test.sh | 4 -- 6 files changed, 11 insertions(+), 76 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e2ac3e..918d0cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,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##*@}" diff --git a/tests/src/test/scala/runtime/actionContainers/Php71ActionContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/Php71ActionContainerTests.scala index 03f42f3..44352d9 100644 --- a/tests/src/test/scala/runtime/actionContainers/Php71ActionContainerTests.scala +++ b/tests/src/test/scala/runtime/actionContainers/Php71ActionContainerTests.scala @@ -24,4 +24,7 @@ import org.scalatest.junit.JUnitRunner class Php71ActionContainerTests extends Php7ActionContainerTests { override lazy val phpContainerImageName = "action-php-v7.1" + + override val testLargeInput = TestConfig("", skipTest = true) + } diff --git a/tests/src/test/scala/runtime/actionContainers/Php7ActionContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/Php7ActionContainerTests.scala index e2255c3..430ea71 100644 --- a/tests/src/test/scala/runtime/actionContainers/Php7ActionContainerTests.scala +++ b/tests/src/test/scala/runtime/actionContainers/Php7ActionContainerTests.scala @@ -119,16 +119,14 @@ abstract class Php7ActionContainerTests extends BasicActionRunnerTests with WskA } override val testLargeInput = { - TestConfig( - """ + TestConfig(""" |<?php |function main(array $args) : array { | echo 'hello stdout'; | error_log('hello stderr'); | return $args; |} - """.stripMargin, - skipTest = true) + """.stripMargin) } it should "fail to initialize with bad code" in { 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 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 - - -
