creating 0.6.0 release branch

cylondata · Feb 17, 2020 · 6b8373f · 6b8373f
1 parent c72fdd5
commit 6b8373f
Show file tree

Hide file tree

Showing 25 changed files with 57 additions and 57 deletions.
diff --git a/docker/kubernetes/baseimage/build-push.sh b/docker/kubernetes/baseimage/build-push.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # build Twister2 base docker image
-VERSION="0.6.0-SNAPSHOT"
+VERSION="0.6.0"
 TWISTER2_BASE_IMAGE="twister2/twister2-k8s-base"
 
 # build docker image

diff --git a/docker/kubernetes/image/Dockerfile b/docker/kubernetes/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM twister2/twister2-k8s-base:0.6.0-SNAPSHOT
+FROM twister2/twister2-k8s-base:0.6.0
 
 # Disable prompts from apt.
 ENV DEBIAN_FRONTEND noninteractive
@@ -9,9 +9,9 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV CLASSPATH="/twister2/lib/*"
 
 COPY docker/kubernetes/image/rootfs /
-COPY twister2-0.6.0-SNAPSHOT/lib /twister2/lib
-COPY twister2-0.6.0-SNAPSHOT/bin /twister2/bin
-COPY twister2-0.6.0-SNAPSHOT/conf/dashboard /twister2/conf/dashboard
+COPY twister2-0.6.0/lib /twister2/lib
+COPY twister2-0.6.0/bin /twister2/bin
+COPY twister2-0.6.0/conf/dashboard /twister2/conf/dashboard
 
 # expose 2022 for ssh server (password free ssh support)
 # expose 8080 for dashboard server if it runs

diff --git a/docker/mesos/readme.md b/docker/mesos/readme.md
@@ -21,7 +21,7 @@ twister2 core and job files into this docker container when you initialize it.
 
 ```bash
 $ cd twister2
-$ wget web_server_ip_address:port_number/twister2/mesos/twister2-core-0.6.0-SNAPSHOT.tar.gz
+$ wget web_server_ip_address:port_number/twister2/mesos/twister2-core-0.6.0.tar.gz
 $ wget web_server_ip_address:port_number/twister2/mesos/twister2-job.tar.gz
 ```
 

diff --git a/docker/mesos/rootfs/init.sh b/docker/mesos/rootfs/init.sh
@@ -6,7 +6,7 @@
 
 cd twister2
 if [ "$DOWNLOAD_METHOD" = 'HTTP' ]; then  
-	wget 149.165.150.81:8082/twister2/mesos/twister2-core-0.6.0-SNAPSHOT.tar.gz
+	wget 149.165.150.81:8082/twister2/mesos/twister2-core-0.6.0.tar.gz
 	wget 149.165.150.81:8082/twister2/mesos/twister2-job.tar.gz
 else 
 	echo "hdfs or other method was choosen"
@@ -19,10 +19,10 @@ echo "starting sshd"
 
 #chmod 600 ~/.ssh/id_rsa
 
-if [ ! -f twister2-core-0.6.0-SNAPSHOT.tar.gz ]; then
+if [ ! -f twister2-core-0.6.0.tar.gz ]; then
     echo "file not found. Probably could not download the file"
 else
-    tar xvf twister2-core-0.6.0-SNAPSHOT.tar.gz
+    tar xvf twister2-core-0.6.0.tar.gz
     tar xvf twister2-job.tar.gz
     echo "files fetched and unpacked"
     java -cp twister2-core/lib/*:twister2-job/libexamples-java.jar:/customJars/* $CLASS_NAME

diff --git a/docker/standalone/Dockerfile b/docker/standalone/Dockerfile
@@ -53,7 +53,7 @@ ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache
 # clone & build twister2
 RUN git clone https://github.com/DSC-SPIDAL/twister2.git && \
 	cd twister2 && git fetch && git checkout master && ~/.bazel/bin/bazel build --config=ubuntu scripts/package:tarpkgs && cd && \
-	tar -xzvf twister2/bazel-bin/scripts/package/twister2-0.6.0-SNAPSHOT.tar.gz && \
+	tar -xzvf twister2/bazel-bin/scripts/package/twister2-0.6.0.tar.gz && \
 	echo "export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64" >> ~/.bashrc && \
-	sed -i '/twister2.resource.scheduler.mpi.mpirun.file/c\twister2.resource.scheduler.mpi.mpirun.file: "mpirun"' /home/twister2/twister2-0.6.0-SNAPSHOT/conf/standalone/resource.yaml && \
+	sed -i '/twister2.resource.scheduler.mpi.mpirun.file/c\twister2.resource.scheduler.mpi.mpirun.file: "mpirun"' /home/twister2/twister2-0.6.0/conf/standalone/resource.yaml && \
 	rm -rf bin ~/.cache/bazel
diff --git a/docker/tutorial/image/Dockerfile b/docker/tutorial/image/Dockerfile
@@ -64,7 +64,7 @@ EXPOSE 2022 2023 30000 30001 30002 30003 30004 30005 30006 30007 30008 30009 300
 
 
 COPY rootfs/config /root/.ssh/
-COPY twister2-0.6.0-SNAPSHOT /twister2-0.6.0-SNAPSHOT/
+COPY twister2-0.6.0 /twister2-0.6.0/
 
 RUN apt-get update && apt-get install -y python python-dev python-pip python-virtualenv rsync
 CMD ["/init.sh","-bash"]

diff --git a/docs/website/pages/en/configs.js b/docs/website/pages/en/configs.js
diff --git a/docs/website/static/javadocs/constant-values.html b/docs/website/static/javadocs/constant-values.html
@@ -1091,7 +1091,7 @@ <h2 title="edu.iu">edu.iu.*</h2>
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <td><code><a href="edu/iu/dsc/tws/api/scheduler/SchedulerContext.html#CORE_PACKAGE_FILENAME_DEFAULT">CORE_PACKAGE_FILENAME_DEFAULT</a></code></td>
-<td class="colLast"><code>"twister2-core-0.6.0-SNAPSHOT.tar.gz"</code></td>
+<td class="colLast"><code>"twister2-core-0.6.0.tar.gz"</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="edu.iu.dsc.tws.api.scheduler.SchedulerContext.CORE_PACKAGE_URL">

diff --git a/scripts/nightly_bench/run.sh b/scripts/nightly_bench/run.sh
@@ -17,27 +17,27 @@ echo "Twister2 built...."
 cd bazel-bin/scripts/package/ || (echo "Build has failed" && exit)
 
 # extract
-tar -xvzf twister2-0.6.0-SNAPSHOT.tar.gz
+tar -xvzf twister2-0.6.0.tar.gz
 
 # copy hosts
 cd ../../../../
-rm twister2/bazel-bin/scripts/package/twister2-0.6.0-SNAPSHOT/conf/standalone/nodes -f
-cp nodes twister2/bazel-bin/scripts/package/twister2-0.6.0-SNAPSHOT/conf/standalone/
+rm twister2/bazel-bin/scripts/package/twister2-0.6.0/conf/standalone/nodes -f
+cp nodes twister2/bazel-bin/scripts/package/twister2-0.6.0/conf/standalone/
 
-rm twister2/bazel-bin/scripts/package/twister2-0.6.0-SNAPSHOT/conf/standalone/core.yaml -f
-cp core.yaml twister2/bazel-bin/scripts/package/twister2-0.6.0-SNAPSHOT/conf/standalone/
+rm twister2/bazel-bin/scripts/package/twister2-0.6.0/conf/standalone/core.yaml -f
+cp core.yaml twister2/bazel-bin/scripts/package/twister2-0.6.0/conf/standalone/
 
-rm twister2/bazel-bin/scripts/package/twister2-0.6.0-SNAPSHOT/conf/common/core.yaml -f
-cp common_core.yaml twister2/bazel-bin/scripts/package/twister2-0.6.0-SNAPSHOT/conf/common/core.yaml
+rm twister2/bazel-bin/scripts/package/twister2-0.6.0/conf/common/core.yaml -f
+cp common_core.yaml twister2/bazel-bin/scripts/package/twister2-0.6.0/conf/common/core.yaml
 
-rm twister2/bazel-bin/scripts/package/twister2-0.6.0-SNAPSHOT/conf/standalone/mpi.sh -f
-cp mpi.sh twister2/bazel-bin/scripts/package/twister2-0.6.0-SNAPSHOT/conf/standalone/
+rm twister2/bazel-bin/scripts/package/twister2-0.6.0/conf/standalone/mpi.sh -f
+cp mpi.sh twister2/bazel-bin/scripts/package/twister2-0.6.0/conf/standalone/
 
-rm twister2/bazel-bin/scripts/package/twister2-0.6.0-SNAPSHOT/conf/standalone/resource.yaml -f
-cp resource.yaml twister2/bazel-bin/scripts/package/twister2-0.6.0-SNAPSHOT/conf/standalone/
+rm twister2/bazel-bin/scripts/package/twister2-0.6.0/conf/standalone/resource.yaml -f
+cp resource.yaml twister2/bazel-bin/scripts/package/twister2-0.6.0/conf/standalone/
 
 # navigate to test root
-cd twister2/bazel-bin/scripts/package/twister2-0.6.0-SNAPSHOT/util/test/
+cd twister2/bazel-bin/scripts/package/twister2-0.6.0/util/test/
 
 # run tests
 TIMEOUT=10800
@@ -47,8 +47,8 @@ timeout $TIMEOUT python3 launcher.py comms_all_gather
 timeout $TIMEOUT python3 launcher.py comms_all_reduce
 timeout $TIMEOUT python3 launcher.py comms_gather
 
-rm twister2/bazel-bin/scripts/package/twister2-0.6.0-SNAPSHOT/util/test/tests/comms/comms_base.json
-cp comms_base.json bazel-bin/scripts/package/twister2-0.6.0-SNAPSHOT/util/test/tests/comms/
+rm twister2/bazel-bin/scripts/package/twister2-0.6.0/util/test/tests/comms/comms_base.json
+cp comms_base.json bazel-bin/scripts/package/twister2-0.6.0/util/test/tests/comms/
 
 timeout $TIMEOUT python3 launcher.py comms_keyed_gather
 timeout $TIMEOUT python3 launcher.py comms_keyed_partition

diff --git a/twister2/api/src/java/edu/iu/dsc/tws/api/scheduler/SchedulerContext.java b/twister2/api/src/java/edu/iu/dsc/tws/api/scheduler/SchedulerContext.java
@@ -55,7 +55,7 @@ public class SchedulerContext extends Context {
 
   public static final String WORKING_DIRECTORY = "twister2.working_directory";
 
-  public static final String CORE_PACKAGE_FILENAME_DEFAULT = "twister2-core-0.6.0-SNAPSHOT.tar.gz";
+  public static final String CORE_PACKAGE_FILENAME_DEFAULT = "twister2-core-0.6.0.tar.gz";
   public static final String CORE_PACKAGE_FILENAME = "twister2.package.core";
 
   public static final String JOB_PACKAGE_FILENAME_DEFAULT = "twister2-job.tar.gz";
@@ -117,7 +117,7 @@ public static String temporaryPackagesPath(Config cfg) {
 
   public static String systemPackageUrl(Config cfg) {
     return TokenSub.substitute(cfg, cfg.getStringValue(SYSTEM_PACKAGE_URI,
-        "${TWISTER2_DIST}/twister2-core-0.6.0-SNAPSHOT.tar.gz"), Context.substitutions);
+        "${TWISTER2_DIST}/twister2-core-0.6.0.tar.gz"), Context.substitutions);
   }
 
   public static URI jobPackageUri(Config cfg) {

diff --git a/twister2/config/src/yaml/conf/aurora/resource.yaml b/twister2/config/src/yaml/conf/aurora/resource.yaml
@@ -1,5 +1,5 @@
 # the package uri
-twister2.resource.system.package.uri: "${TWISTER2_DIST}/twister2-core-0.6.0-SNAPSHOT.tar.gz"
+twister2.resource.system.package.uri: "${TWISTER2_DIST}/twister2-core-0.6.0.tar.gz"
 
 # launcher class for aurora submission
 twister2.resource.class.launcher: edu.iu.dsc.tws.rsched.schedulers.aurora.AuroraLauncher

diff --git a/twister2/config/src/yaml/conf/aurora/twister2.aurora b/twister2/config/src/yaml/conf/aurora/twister2.aurora
@@ -1,7 +1,7 @@
 # Path of the twister2 core and job package to be uploaded to Mesos container excluding filename
 path = '{{TWISTER2_PACKAGES_PATH}}'
 # filename of the twister2 core package to be uploaded to Mesos container
-# coreFN='twister2-core-0.6.0-SNAPSHOT.tar.gz'
+# coreFN='twister2-core-0.6.0.tar.gz'
 coreFN='{{CORE_PACKAGE_FILENAME}}'
 # twister2 job package filename
 jobFN = '{{JOB_PACKAGE_FILENAME}}'

diff --git a/twister2/config/src/yaml/conf/kubernetes/deployment/twister2-dashboard-with-ps.yaml b/twister2/config/src/yaml/conf/kubernetes/deployment/twister2-dashboard-with-ps.yaml
@@ -86,7 +86,7 @@ spec:
 
       containers:
         - name: twister2-dashboard
-          image: twister2/twister2-k8s:0.6.0-SNAPSHOT
+          image: twister2/twister2-k8s:0.6.0
           imagePullPolicy: IfNotPresent
           command: ["/twister2/bin/twister2"]
           args: ["dash"]

diff --git a/twister2/config/src/yaml/conf/kubernetes/deployment/twister2-dashboard-wo-ps.yaml b/twister2/config/src/yaml/conf/kubernetes/deployment/twister2-dashboard-wo-ps.yaml
@@ -58,7 +58,7 @@ spec:
 
       containers:
         - name: twister2-dashboard
-          image: twister2/twister2-k8s:0.6.0-SNAPSHOT
+          image: twister2/twister2-k8s:0.6.0
           imagePullPolicy: IfNotPresent
           command: ["/twister2/bin/twister2"]
           args: ["dash"]

diff --git a/twister2/config/src/yaml/conf/kubernetes/resource.yaml b/twister2/config/src/yaml/conf/kubernetes/resource.yaml
@@ -2,10 +2,10 @@
 # Kubernetes Docker Image and related settings
 ################################################################################
 # Twister2 Docker image for Kubernetes
-twister2.resource.kubernetes.docker.image: "twister2/twister2-k8s:0.6.0-SNAPSHOT"
+twister2.resource.kubernetes.docker.image: "twister2/twister2-k8s:0.6.0"
 
 # the package uri
-twister2.resource.system.package.uri: "${TWISTER2_DIST}/twister2-core-0.6.0-SNAPSHOT.tar.gz"
+twister2.resource.system.package.uri: "${TWISTER2_DIST}/twister2-core-0.6.0.tar.gz"
 
 twister2.resource.class.launcher: edu.iu.dsc.tws.rsched.schedulers.k8s.KubernetesLauncher
 

diff --git a/twister2/config/src/yaml/conf/mesos/resource.yaml b/twister2/config/src/yaml/conf/mesos/resource.yaml
@@ -26,7 +26,7 @@ twister2.resource.mesos.scheduler.driver.stop.timeout.ms: 5000
 twister2.resource.mesos.native.library.path: "/usr/lib/mesos/0.28.1/lib/"
 
 # the core package uri
-twister2.resource.system.package.uri: "${TWISTER2_DIST}/twister2-core-0.6.0-SNAPSHOT.tar.gz"
+twister2.resource.system.package.uri: "${TWISTER2_DIST}/twister2-core-0.6.0.tar.gz"
 
 
 #overlay network name for docker containers

diff --git a/twister2/config/src/yaml/conf/nomad/nomad.sh b/twister2/config/src/yaml/conf/nomad/nomad.sh
@@ -16,7 +16,7 @@ echo $debug
 
 # download the package
 #wget http://149.165.150.81:8082/twister2/mesos/twister2-job.tar.gz .
-#wget http://149.165.150.81:8082/twister2/mesos/twister2-core-0.6.0-SNAPSHOT.tar.gz .
+#wget http://149.165.150.81:8082/twister2/mesos/twister2-core-0.6.0.tar.gz .
 
 method=$10
 
@@ -25,21 +25,21 @@ method=$10
 
 if [ $method = "LOCAL" ]; then
   cp $11/twister2-job.tar.gz .
-  cp $11/twister2-core-0.6.0-SNAPSHOT.tar.gz .
+  cp $11/twister2-core-0.6.0.tar.gz .
 else
   wget $8 .
   wget $9 .
 fi
 
-tar -xvf twister2-core-0.6.0-SNAPSHOT.tar.gz
+tar -xvf twister2-core-0.6.0.tar.gz
 tar -xvf twister2-job.tar.gz --strip 1
 
 profile=
 debug=
 
 ls
 cp="*:twister2-core/lib/*"
-#cp="*:twister2-0.6.0-SNAPSHOT/lib/*"
+#cp="*:twister2-0.6.0/lib/*"
 echo $cp
 echo "1" $1
 echo "2" $2

diff --git a/twister2/config/src/yaml/conf/nomad/resource.yaml b/twister2/config/src/yaml/conf/nomad/resource.yaml
@@ -3,7 +3,7 @@ twister2.resource.scheduler.mpi.working.directory: "${HOME}/.twister2/jobs"
 
 twister2.resource.job.package.url: "http://149.165.xxx.xx:8082/twister2/mesos/twister2-job.tar.gz"
 
-twister2.resource.core.package.url: "http://149.165.xxx.xx:8082/twister2/mesos/twister2-core-0.6.0-SNAPSHOT.tar.gz"
+twister2.resource.core.package.url: "http://149.165.xxx.xx:8082/twister2/mesos/twister2-core-0.6.0.tar.gz"
 
 
 # the launcher class
@@ -28,7 +28,7 @@ twister2.resource.filesystem.shared: true
 twister2.resource.nomad.shell.script: "nomad.sh"
 
 # path to the system core package
-twister2.resource.system.package.uri: "${TWISTER2_DIST}/twister2-core-0.6.0-SNAPSHOT.tar.gz"
+twister2.resource.system.package.uri: "${TWISTER2_DIST}/twister2-core-0.6.0.tar.gz"
 
 # ZooKeeper server addresses: comma separated host:port pairs
 # example: "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002"

diff --git a/twister2/config/src/yaml/conf/slurm/resource.yaml b/twister2/config/src/yaml/conf/slurm/resource.yaml
@@ -17,7 +17,7 @@ twister2.resource.scheduler.slurm.partition: "juliet"
 twister2.resource.scheduler.mpi.home: ""
 
 # the package uri
-twister2.resource.system.package.uri: "${TWISTER2_DIST}/twister2-core-0.6.0-SNAPSHOT.tar.gz"
+twister2.resource.system.package.uri: "${TWISTER2_DIST}/twister2-core-0.6.0.tar.gz"
 
 # the launcher class
 twister2.resource.class.launcher: "edu.iu.dsc.tws.rsched.schedulers.standalone.MPILauncher"

diff --git a/twister2/config/src/yaml/conf/standalone/resource.yaml b/twister2/config/src/yaml/conf/standalone/resource.yaml
@@ -14,7 +14,7 @@ twister2.resource.scheduler.mpi.shell.script: "mpi.sh"
 twister2.resource.scheduler.mpi.home: ""
 
 # the package uri
-twister2.resource.system.package.uri: "${TWISTER2_DIST}/twister2-core-0.6.0-SNAPSHOT.tar.gz"
+twister2.resource.system.package.uri: "${TWISTER2_DIST}/twister2-core-0.6.0.tar.gz"
 
 # the launcher class
 twister2.resource.class.launcher: "edu.iu.dsc.tws.rsched.schedulers.standalone.MPILauncher"

diff --git a/twister2/examples/tests/java/edu/iu/dsc/tws/examples/batch/kmeans/CSVInputFormatTest.java b/twister2/examples/tests/java/edu/iu/dsc/tws/examples/batch/kmeans/CSVInputFormatTest.java
@@ -87,7 +87,7 @@ private ComputeGraph createBatchGraph(int parallel) {
 
   private Config getConfig() {
     String twister2Home = "/home/" + System.getProperty("user.dir")
-        + "/twister2/bazel-bin/scripts/package/twister2-0.6.0-SNAPSHOT";
+        + "/twister2/bazel-bin/scripts/package/twister2-0.6.0";
     String configDir = "/home/" + System.getProperty("user.dir")
         + "/twister2/twister2/taskscheduler/tests/conf/";
     String clusterType = "standalone";

diff --git a/twister2/python-support/pom.xml b/twister2/python-support/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.twister2</groupId>
             <artifactId>api-java</artifactId>
-            <version>0.6.0-SNAPSHOT</version>
+            <version>0.6.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.ow2.asm/asm -->
         <dependency>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.twister2</groupId>
             <artifactId>tset-java</artifactId>
-            <version>0.6.0-SNAPSHOT</version>
+            <version>0.6.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
         <dependency>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.twister2</groupId>
             <artifactId>local-runner-java</artifactId>
-            <version>0.6.0-SNAPSHOT</version>
+            <version>0.6.0</version>
         </dependency>
         <dependency>
             <groupId>net.sf.py4j</groupId>

diff --git a/twister2/resource-scheduler/src/java/edu/iu/dsc/tws/rsched/job/Twister2Submitter.java b/twister2/resource-scheduler/src/java/edu/iu/dsc/tws/rsched/job/Twister2Submitter.java
@@ -93,7 +93,7 @@ public static Twister2JobState submitJob(Twister2Job twister2Job, Config config)
         + "/__   \\__      _(_)___| |_ ___ _ _|___ \\ \n"
         + "  / /\\/\\ \\ /\\ / / / __| __/ _ \\ '__|__) |\n"
         + " / /    \\ V  V /| \\__ \\ ||  __/ |  / __/ \n"
-        + " \\/      \\_/\\_/ |_|___/\\__\\___|_| |_____| v0.6.0-SNAPSHOT\n"
+        + " \\/      \\_/\\_/ |_|___/\\__\\___|_| |_____| v0.6.0\n"
         + "                                         \n"
         + "Job Name\t:\t" + job.getJobName() + "\n"
         + "Job ID\t\t:\t" + jobId + "\n"

diff --git a/twister2/taskscheduler/tests/java/edu/iu/dsc/tws/tsched/taskscheduler/TaskSchedulerTest.java b/twister2/taskscheduler/tests/java/edu/iu/dsc/tws/tsched/taskscheduler/TaskSchedulerTest.java
@@ -105,7 +105,7 @@ private ComputeGraph createBatchGraph(int parallel) {
   private Config getConfig() {
 
     String twister2Home = "/home/" + System.getProperty("user.dir")
-        + "/twister2/bazel-bin/scripts/package/twister2-0.6.0-SNAPSHOT";
+        + "/twister2/bazel-bin/scripts/package/twister2-0.6.0";
     String configDir = "/home/" + System.getProperty("user.dir")
         + "/twister2/twister2/taskscheduler/tests/conf/";
     String clusterType = "standalone";

diff --git a/util/mvn/install-local-snapshot.sh b/util/mvn/install-local-snapshot.sh
@@ -4,7 +4,7 @@ set -eu
 
 echo -e "Installing maven snapshot locally...\n"
 
-version=${1:-0.6.0-SNAPSHOT}
+version=${1:-0.6.0}
 
 bash $(dirname $0)/execute-deploy.sh \
   "install:install-file" \