Update the scripts for 0.9.0 release (#215)
* Remove the MD5 checksums, since it is not favored in Apache
* Remove the gradle wrapper jar from the source code package
* Add the version number to the root directory in the source code package
diff --git a/docs/sign_artifacts.md b/docs/sign_artifacts.md
index 462919a..5bef44d 100644
--- a/docs/sign_artifacts.md
+++ b/docs/sign_artifacts.md
@@ -52,4 +52,4 @@
If you have configured your local SVN with the username and the password, you can run the above script without the parameters.
-This script generates a file of the MD5 checksum suffixed with .md5, a file of the SHA512 checksum suffixed with .sha512, and a signature file suffixed with .asc for each package.
+This script generates a file of the SHA512 checksum suffixed with .sha512, and a signature file suffixed with .asc for each package.
diff --git a/releases/0.9.0-incubating/INSTALL.md b/releases/0.9.0-incubating/INSTALL.md
index 1c5ea63..29ecab7 100644
--- a/releases/0.9.0-incubating/INSTALL.md
+++ b/releases/0.9.0-incubating/INSTALL.md
@@ -29,7 +29,7 @@
tutorial [here](https://github.com/apache/incubator-openwhisk-utilities) about how to run it on the directory level.
-# Verify the MD5 & SHA-512 checksums, and signature
+# Verify the SHA-512 checksums, and signature
You need to install gpg on your local machine.
@@ -54,16 +54,6 @@
The parameter <key_file> is the file, where the public key is saved.
-
-To generate the MD5 checksum:
-
-```
-$ gpg --print-md MD5 <artifact>
-```
-
-The parameter <artifact> is the file of the artifact "openwhisk-0.9.0-incubating-sources.tar.gz". Compare the content with the [MD5 file](https://dist.apache.org/repos/dist/dev/incubator/openwhisk/apache-openwhisk-0.9.0-incubating-rc1/openwhisk-0.9.0-incubating-sources.tar.gz.md5).
-
-
To generate the SHA512 checksum:
```
@@ -83,16 +73,16 @@
This instruction walks you through the steps to install OpenWhisk 0.9.0. We support both Ubuntu and Mac operating systems.
Please download the source code package of OpenWhisk "openwhisk-0.9.0-incubating-sources.tar.gz" and unzip it, then you
-get a directory called "incubator-openwhisk" on your local machine.
+get a directory called "incubator-openwhisk-<version>" on your local machine.
## Prerequisites
If you are a Ubuntu user, our suggested version is between 14.04 and 16.04. Open a terminal, go to the directory of "incubator-openwhisk",
-and run the script "all.sh" under tools//ubuntu-setup:
+and run the script "all.sh" under tools/ubuntu-setup:
```
-$ cd incubator-openwhisk
+$ cd incubator-openwhisk-<version>
$ ./tools/ubuntu-setup/all.sh
```
@@ -134,7 +124,9 @@
## Build the source code
-Stay under the directory of incubator-openwhisk, and run the following gradlew command to build the source code:
+
+Stay under the directory of incubator-openwhisk-<version>, and download [gradle-wrapper-4.8.1.jar](https://repo.gradle.org/gradle/libs-releases-local/org/gradle/gradle-wrapper/4.8.1/gradle-wrapper-4.8.1.jar) and place it in the gradle/wrapper
+folder. Rename it into gradle-wrapper.jar, run the following gradlew command to build the source code:
```
$ ./gradlew distDocker
@@ -147,9 +139,10 @@
## Deploy OpenWhisk
-Stay under the directory of incubator-openwhisk, and run the following ansible scripts one by one:
+Stay under the directory of incubator-openwhisk-<version>, and run the following ansible scripts one by one:
```
+$ cd ansible
$ ansible-playbook -i environments/local setup.yml
$ ansible-playbook -i environments/local prereq.yml
$ ansible-playbook -i environments/local couchdb.yml
@@ -182,7 +175,7 @@
$ wsk property set --apihost 172.17.0.1 --auth $(cat ${OPENWHISK_HOME}/ansible/files/auth.guest)
```
-The environment variable $OPENWHISK_HOME points to the directory incubator-openwhisk. After that, run the following command
+The environment variable $OPENWHISK_HOME points to the directory incubator-openwhisk-<version>. After that, run the following command
to each an input message:
```
diff --git a/tools/package_source_code.sh b/tools/package_source_code.sh
index 557737a..b0c7ea2 100755
--- a/tools/package_source_code.sh
+++ b/tools/package_source_code.sh
@@ -30,7 +30,7 @@
# Remove bin and build folders
mkdir -p $OPENWHISK_CLEANED_SOURCE_DIR
rm -rf $OPENWHISK_CLEANED_SOURCE_DIR/*
-rsync -rtp --exclude .bin --exclude .jshintrc --exclude .pydevproject --exclude .rat-excludes --exclude .git\* --exclude .travis.yml --exclude build --exclude specification/archive --exclude specification/diagrams --exclude tests $OPENWHISK_SOURCE_DIR/. $OPENWHISK_CLEANED_SOURCE_DIR
+rsync -rtp --exclude gradle/wrapper/gradle-\*.jar --exclude .bin --exclude .jshintrc --exclude .pydevproject --exclude .rat-excludes --exclude .git\* --exclude .travis.yml --exclude build --exclude specification/archive --exclude specification/diagrams --exclude tests $OPENWHISK_SOURCE_DIR/. $OPENWHISK_CLEANED_SOURCE_DIR
for repo in $(echo $repos | sed "s/,/ /g")
do
@@ -38,7 +38,9 @@
project_name="incubator-$repo_name"
rm -rf $OPENWHISK_CLEANED_SOURCE_DIR/$project_name/.git
cd $OPENWHISK_CLEANED_SOURCE_DIR
- tar czf ${CURRENT_VERSION_DIR}/${repo_name}-${version}-sources.tar.gz $project_name
+ # Rename the directory by adding the version number
+ mv $project_name $project_name-$version
+ tar czfv ${CURRENT_VERSION_DIR}/${repo_name}-${version}-sources.tar.gz $project_name-$version
done
# Copy the documents for the current release into the $CURRENT_VERSION_DIR directory
diff --git a/tools/sign_artifacts.sh b/tools/sign_artifacts.sh
index 825f823..2f4f020 100755
--- a/tools/sign_artifacts.sh
+++ b/tools/sign_artifacts.sh
@@ -37,7 +37,6 @@
echo "Sign the artifacts with the private key."
for artifact in *.tar.gz *.zip *.tgz; do
if [ "${artifact}" != "*.tar.gz" ] && [ "${artifact}" != "*.zip" ] && [ "${artifact}" != "*.tgz" ] ; then
- gpg --print-md MD5 ${artifact} > ${artifact}.md5
gpg --print-md SHA512 ${artifact} > ${artifact}.sha512
if [ $sysOS == "Darwin" ];then
diff --git a/tools/util.sh b/tools/util.sh
index fdb3775..277ba61 100755
--- a/tools/util.sh
+++ b/tools/util.sh
@@ -35,15 +35,6 @@
echo "Checking signatures and hashes of artifacts"
for artifact in $(find * -type f \( -name '*.tar.gz' \) ); do
- # Check md5
- artifactMD5=$(gpg --print-md MD5 ${artifact})
- artifactMD5File=$(cat ${artifact}.md5)
- if [ "$artifactMD5" == "$artifactMD5File" ];then
- echo "[✓] MD5 verified for $artifact"
- else
- echo "[x] Unmatched MD5 for $artifact."; exit 1;
- fi
-
# Check sha512
artifactSha512=$(gpg --print-md SHA512 ${artifact})
artifactSha512File=$(cat ${artifact}.sha512)
