From 29874857aea683119a2a728018e41f1eac6eeed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ko=C5=BEusznik?= <jan@kozusznik.cz>
Date: Sat, 8 Dec 2018 01:07:34 +0100
Subject: [PATCH] fix: migration to dd-18-42
---
haas-imagej-client/src/main/resources/config.yaml | 2 +-
.../src/main/java/cz/it4i/fiji/haas_java_client/JobInfo.java | 1 -
.../java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java | 2 +-
.../src/main/java/cz/it4i/fiji/scpclient/ScpClient.java | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/haas-imagej-client/src/main/resources/config.yaml b/haas-imagej-client/src/main/resources/config.yaml
index 80dddfef..23bfbc9d 100644
--- a/haas-imagej-client/src/main/resources/config.yaml
+++ b/haas-imagej-client/src/main/resources/config.yaml
@@ -199,7 +199,7 @@ common: {
# beanshell and snakefile diretory
# directory for cuda libraries
# xvfb setting
- sysconfcpus: "/scratch/work/project/open-12-20/haas/spim/bin/sysconfcpus -n",
+ # sysconfcpus
# ============================================================================
# current working Fiji
fiji-app: "/scratch/work/project/open-12-20/haas/spim/Fiji.app/ImageJ-linux64 -Xss4m",
diff --git a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/JobInfo.java b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/JobInfo.java
index 07b7517e..523370a5 100644
--- a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/JobInfo.java
+++ b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/JobInfo.java
@@ -6,7 +6,6 @@ import java.util.List;
public interface JobInfo {
-
Collection<Long> getTasks();
JobState getState();
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java
index 500fbdfb..dd5df44d 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java
@@ -14,7 +14,7 @@ public interface Constants {
String HAAS_JOB_NAME = "HaaSSPIMBenchmark";
int HAAS_CLUSTER_NODE_TYPE = 7;
int HAAS_TEMPLATE_ID = 4;
- String HAAS_PROJECT_ID = "";
+ String HAAS_PROJECT_ID = "DD-18-42";
int HAAS_TIMEOUT = 3600; //Walltime in seconds
long WAIT_FOR_SUBMISSION_TIMEOUT = 100;
String BDS_ADDRESS = "http://julius2.it4i.cz/";
diff --git a/java-scpclient/src/main/java/cz/it4i/fiji/scpclient/ScpClient.java b/java-scpclient/src/main/java/cz/it4i/fiji/scpclient/ScpClient.java
index 9290ea26..cbcfc0f1 100644
--- a/java-scpclient/src/main/java/cz/it4i/fiji/scpclient/ScpClient.java
+++ b/java-scpclient/src/main/java/cz/it4i/fiji/scpclient/ScpClient.java
@@ -402,7 +402,7 @@ public class ScpClient implements Closeable {
IOException, InterruptedIOException
{
AckowledgementChecker ack = new AckowledgementChecker();
- boolean ptimestamp = true;
+ boolean ptimestamp = false;
// exec 'scp -t rfile' remotely
String command = "scp " + (ptimestamp ? "-p" : "") + " -t '" + fileName + "'";
Channel channel = getConnectedSession().openChannel("exec");
--
GitLab