From b25b3aa4b4061c7ddad7d4ba53e66e21bf8b92d2 Mon Sep 17 00:00:00 2001 From: Luke Roy Date: Fri, 22 Jul 2022 11:41:33 +0200 Subject: [PATCH 1/3] Set Controller and Invoker Tag from nightly to ecb2a98 --- tools/travis/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/travis/build.sh b/tools/travis/build.sh index 05fac83..6b53bf7 100755 --- a/tools/travis/build.sh +++ b/tools/travis/build.sh @@ -21,10 +21,10 @@ fi cd $WHISKDIR #pull down images -docker pull openwhisk/controller:nightly -docker tag openwhisk/controller:nightly ${IMAGE_PREFIX}/controller -docker pull openwhisk/invoker:nightly -docker tag openwhisk/invoker:nightly ${IMAGE_PREFIX}/invoker +docker pull openwhisk/controller:ecb2a98 +docker tag openwhisk/controller:ecb2a98 ${IMAGE_PREFIX}/controller +docker pull openwhisk/invoker:ecb2a98 +docker tag openwhisk/invoker:ecb2a98 ${IMAGE_PREFIX}/invoker docker pull openwhisk/nodejs6action:nightly docker tag openwhisk/nodejs6action:nightly nodejs6action From 048af0ef45c7a6846c49192f50e3ab44eed6b584 Mon Sep 17 00:00:00 2001 From: Luke Roy Date: Fri, 22 Jul 2022 13:20:12 +0200 Subject: [PATCH 2/3] Set Controller and Invoker to ibmfunctions image --- tools/travis/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/travis/build.sh b/tools/travis/build.sh index 6b53bf7..754a970 100755 --- a/tools/travis/build.sh +++ b/tools/travis/build.sh @@ -21,10 +21,10 @@ fi cd $WHISKDIR #pull down images -docker pull openwhisk/controller:ecb2a98 -docker tag openwhisk/controller:ecb2a98 ${IMAGE_PREFIX}/controller -docker pull openwhisk/invoker:ecb2a98 -docker tag openwhisk/invoker:ecb2a98 ${IMAGE_PREFIX}/invoker +docker pull ibmfunctions/controller:nightly +docker tag ibmfunctions/controller:nightly ${IMAGE_PREFIX}/controller +docker pull ibmfunctions/invoker:nightly +docker tag ibmfunctions/invoker:nightly ${IMAGE_PREFIX}/invoker docker pull openwhisk/nodejs6action:nightly docker tag openwhisk/nodejs6action:nightly nodejs6action From e35b9338bfc6d0b6d8c812d3a59e626249b6c364 Mon Sep 17 00:00:00 2001 From: Luke Roy Date: Fri, 22 Jul 2022 13:53:17 +0200 Subject: [PATCH 3/3] Set openwhisk to ibm openwhisk --- tools/travis/setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh index 0d01c19..0468aef 100755 --- a/tools/travis/setup.sh +++ b/tools/travis/setup.sh @@ -11,11 +11,11 @@ HOMEDIR="$SCRIPTDIR/../../../" cd $HOMEDIR # git clone --depth=1 https://github.com/apache/incubator-openwhisk.git openwhisk -git clone https://github.com/apache/openwhisk.git openwhisk +git clone https://github.com/ibm-functions/openwhisk.git openwhisk cd openwhisk # Use a fixed commit to run the tests, to explicitly control when changes are consumed. # Commit: Update the notice year (#5122) -git checkout ecb2a980659f28d0adbd9ef837afaf4cb2b695bf +git checkout 7ae02b8ede4f4b4068b3b95dbc3f02f902d936c9 # Work around for the missing azure-storage-blob:12.6.0 issue. # Version 12.6.0 was removed from maven central. Patching the code to use 12.7.0 instead.