jeremiaswerner closed pull request #2999: Fix vagrant due to removal of cli
gradle task
URL: https://github.com/apache/incubator-openwhisk/pull/2999
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/settings.gradle b/settings.gradle
index 200ff09100..19d3506517 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,8 +12,6 @@ include 'actionRuntimes:swift3.1.1Action'
include 'actionRuntimes:javaAction'
include 'actionRuntimes:php7.1Action'
-include 'tools:cli'
-
include 'sdk:docker'
include 'tests'
diff --git a/tools/build/redo b/tools/build/redo
index ef4e7dba69..7f36b56b96 100755
--- a/tools/build/redo
+++ b/tools/build/redo
@@ -260,8 +260,7 @@ Components = [
gradle = ':core:invoker'),
makeComponent('edge',
- 'deploy edge',
- gradle = ':tools:cli'),
+ 'deploy edge'),
makeComponent('catalog',
'install catalog',
@@ -314,11 +313,6 @@ Components = [
yaml = False,
gradle = 'sdk:docker'),
- makeComponent('cli',
- 'build CLI (to deploy, use edge component)',
- yaml = False,
- gradle = ':tools:cli'),
-
# required for tests
makeComponent('props',
'build whisk.properties file (required for tests)',
diff --git a/tools/vagrant/Vagrantfile b/tools/vagrant/Vagrantfile
index 49b0549a46..2ec82295f8 100644
--- a/tools/vagrant/Vagrantfile
+++ b/tools/vagrant/Vagrantfile
@@ -134,21 +134,21 @@ $script_end = <<SCRIPT
source /etc/environment
# Build OpenWhisk using gradle
cd ${OPENWHISK_HOME}
- su vagrant -c './gradlew tools:cli:distDocker -PdockerImagePrefix=openwhisk'
+ su vagrant -c './gradlew distDocker'
echo "`date`: deploy-start" >> /tmp/vagrant-times.txt
# Deploy OpenWhisk using ansible
cd ${ANSIBLE_HOME}
su vagrant -c 'ansible-playbook -i environments/local wipe.yml'
su vagrant -c 'ansible-playbook -i environments/local apigateway.yml'
- su vagrant -c 'ansible-playbook -i environments/local -e
docker_image_prefix=openwhisk openwhisk.yml'
+ su vagrant -c 'ansible-playbook -i environments/local openwhisk.yml'
su vagrant -c 'ansible-playbook -i environments/local postdeploy.yml'
# Setup OpenWhisk CLI
su vagrant -c 'mkdir ${HOME}/bin'
su vagrant -c 'ln -s ${OPENWHISK_HOME}/tools/admin/wskadmin
${HOME}/bin/wskadmin'
su vagrant -c 'ln -s ${OPENWHISK_HOME}/tools/build/redo ${HOME}/bin/wskdev'
- echo ${OPENWHISK_HOME}/bin/linux/amd64/wsk -i '"$@"' > ${HOME}/bin/wsk
+ echo ${OPENWHISK_HOME}/bin/wsk -i '"$@"' > ${HOME}/bin/wsk
chmod +x ${HOME}/bin/wsk
chown vagrant:vagrant ${HOME}/bin/wsk
PATH=${PATH}:${HOME}/bin
----------------------------------------------------------------
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
