houshengbo closed pull request #326: Test if PR passes
URL: https://github.com/apache/incubator-openwhisk-cli/pull/326
 
 
   

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 f1782d4d..f49b450a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,7 +66,7 @@ script:
   - if [ ! -z "$TRAVIS_TAG" ] ; then
         export BUILD_VERSION=$TRAVIS_TAG;
     fi
-  - ./gradlew --console=plain releaseBinaries -PpackageVersion=$BUILD_VERSION
+#  - ./gradlew --console=plain releaseBinaries -PpackageVersion=$BUILD_VERSION
   - ./tools/travis/test_openwhisk.sh
 
 after_success:
diff --git a/build.gradle b/build.gradle
index aa26756f..1932eed2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,7 +41,7 @@ dependencies {
         build(['name':'golang.org/x/sys/unix', 
'version':'7f918dd405547ecb864d14a8ecbbfe205b5f930f', 'transitive':false])
         build(['name':'gopkg.in/yaml.v2', 
'version':'cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b', 'transitive':false])
         build(['name':'github.com/ghodss/yaml', 
'version':'0ca9ea5df5451ffdf184b4428c902747c2c11cd7', 'transitive':false])
-        
build(['name':'github.com/apache/incubator-openwhisk-client-go/whisk','version':'e452b524cd745f71c913c5acccf72a8daba6dc71','transitive':false])
+        
build(['name':'github.com/apache/incubator-openwhisk-client-go/whisk','version':'1e505228d7bb7f16c3077af2b0311ff4cf6e84a3','transitive':false])
         // END - Imported from Godeps
         test name:'github.com/stretchr/testify', 
version:'b91bfb9ebec76498946beb6af7c0230c7cc7ba6c', transitive:false //, tag: 
'v1.2.0'
         test name:'github.com/spf13/viper', 
version:'aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5', transitive:false
diff --git a/main.go b/main.go
old mode 100644
new mode 100755
index 526c505f..748da451
Binary files a/main.go and b/main.go differ
diff --git a/tests/src/test/scala/whisk/core/cli/test/WskConfigTests.scala 
b/tests/src/test/scala/whisk/core/cli/test/WskConfigTests.scala
index f69ddd05..aa49ded5 100644
--- a/tests/src/test/scala/whisk/core/cli/test/WskConfigTests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/WskConfigTests.scala
@@ -46,7 +46,7 @@ class WskConfigTests extends TestHelpers with WskTestHelpers {
     try {
       val env = Map("WSK_CONFIG_FILE" -> tmpwskprops.getAbsolutePath())
       wsk.cli(Seq("property", "set", "-i", "--apihost", "xxxx.yyyy"), env = 
env)
-      val rr = wsk.cli(Seq("property", "get", "--apibuild", "-i"), env = env, 
expectedExitCode = ANY_ERROR_EXIT)
+      val rr = wsk.cli(Seq("property", "get", "--apibuild", "-i"), env = env, 
expectedExitCode = NETWORK_ERROR_EXIT)
       rr.stdout should include regex ("""whisk API build\s*Unknown""")
       rr.stderr should include regex ("Unable to obtain API build information")
     } finally {
diff --git a/tools/travis/test_openwhisk.sh b/tools/travis/test_openwhisk.sh
index 94f27253..b2d04b0d 100755
--- a/tools/travis/test_openwhisk.sh
+++ b/tools/travis/test_openwhisk.sh
@@ -81,12 +81,12 @@ cd $TRAVIS_BUILD_DIR
 #
 
 #  Build docker images
-cd $OPENWHISK_HOME
-./gradlew --console=plain distDocker -PdockerImagePrefix=testing
+#cd $OPENWHISK_HOME
+#./gradlew --console=plain distDocker -PdockerImagePrefix=testing
 
 #  Fire up the cluster
 cd $OPENWHISK_HOME/ansible
-ANSIBLE_CMD="ansible-playbook -i environments/local -e 
docker_image_prefix=testing"
+ANSIBLE_CMD="ansible-playbook -i environments/local -e 
docker_image_prefix=openwhisk"
 $ANSIBLE_CMD setup.yml
 $ANSIBLE_CMD prereq.yml
 $ANSIBLE_CMD couchdb.yml


 

----------------------------------------------------------------
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