You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@submarine.apache.org by ku...@apache.org on 2021/12/16 10:45:27 UTC
[submarine] branch master updated: SUBMARINE-1125. Fix Conda Version match error
This is an automated email from the ASF dual-hosted git repository.
kuanhsun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 78d6b34 SUBMARINE-1125. Fix Conda Version match error
78d6b34 is described below
commit 78d6b34358a595113d0032f6663c1ccb54a29e1c
Author: cdmikechen <cd...@hotmail.com>
AuthorDate: Thu Dec 16 17:35:48 2021 +0800
SUBMARINE-1125. Fix Conda Version match error
### What is this PR for?
The Conda version in jupyter-notebook-0.7.0-SNAPSHOT docker image is 4.11.0 now. But in Submarine it still check version from 4.0.1 to 4.10.10, so that when notebook pod start, it report error like this:
### What type of PR is it?
Bug Fix
### Todos
* [x] - Replace max version to 4.11
### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-1125
### How should this be tested?
Can test in new docker image.
### Screenshots (if appropriate)
### Questions:
* Do the license files need updating? No
* Are there breaking changes for older versions? No
* Does this need new documentation? No
Author: cdmikechen <cd...@hotmail.com>
Signed-off-by: kuanhsun <ku...@apache.org>
Closes #835 from cdmikechen/SUBMARINE-1125 and squashes the following commits:
20a37f9f [cdmikechen] SUBMARINE-1125. Fix Conda Version match error
---
.../main/java/org/apache/submarine/commons/utils/SubmarineConfVars.java | 2 +-
.../apache/submarine/server/submitter/k8s/ExperimentSpecParserTest.java | 2 +-
.../src/test/java/org/apache/submarine/rest/ExperimentRestApiIT.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfVars.java b/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfVars.java
index 03862b4..3c5b397 100644
--- a/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfVars.java
+++ b/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfVars.java
@@ -70,7 +70,7 @@ public class SubmarineConfVars {
"org.apache.submarine.server.submitter.yarn.YarnRuntimeFactory"),
SUBMARINE_SUBMITTER("submarine.submitter", "k8s"),
ENVIRONMENT_CONDA_MIN_VERSION("environment.conda.min.version", "4.0.1"),
- ENVIRONMENT_CONDA_MAX_VERSION("environment.conda.max.version", "4.10.10");
+ ENVIRONMENT_CONDA_MAX_VERSION("environment.conda.max.version", "4.11.10");
private String varName;
@SuppressWarnings("rawtypes")
diff --git a/submarine-server/server-submitter/submitter-k8s/src/test/java/org/apache/submarine/server/submitter/k8s/ExperimentSpecParserTest.java b/submarine-server/server-submitter/submitter-k8s/src/test/java/org/apache/submarine/server/submitter/k8s/ExperimentSpecParserTest.java
index 0ba80e2..e9df5f9 100644
--- a/submarine-server/server-submitter/submitter-k8s/src/test/java/org/apache/submarine/server/submitter/k8s/ExperimentSpecParserTest.java
+++ b/submarine-server/server-submitter/submitter-k8s/src/test/java/org/apache/submarine/server/submitter/k8s/ExperimentSpecParserTest.java
@@ -255,7 +255,7 @@ public class ExperimentSpecParserTest extends SpecBuilder {
+ "\"$currentVersion\" | sort -V | head -n2 | tail -1 )\" "
+ "!= \"$currentVersion\" ]; then echo \"Conda version " +
"should be between minVersion=\"4.0.1\"; " +
- "and maxVersion=\"4.10.10\";\"; exit 1; else echo "
+ "and maxVersion=\"4.11.10\";\"; exit 1; else echo "
+ "\"Conda current version is " + currentVersion + ". "
+ "Moving forward with env creation and activation.\"; "
+ "fi && " +
diff --git a/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/ExperimentRestApiIT.java b/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/ExperimentRestApiIT.java
index 0f36cc3..1cbd386 100644
--- a/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/ExperimentRestApiIT.java
+++ b/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/ExperimentRestApiIT.java
@@ -344,7 +344,7 @@ public class ExperimentRestApiIT extends AbstractSubmarineServerTest {
+ "\"$currentVersion\" | sort -V | head -n2 | tail -1 )\" "
+ "!= \"$currentVersion\" ]; then echo \"Conda version " +
"should be between minVersion=\"4.0.1\"; " +
- "and maxVersion=\"4.10.10\";\"; exit 1; else echo "
+ "and maxVersion=\"4.11.10\";\"; exit 1; else echo "
+ "\"Conda current version is " + currentVersion + ". "
+ "Moving forward with env creation and activation.\"; "
+ "fi && ";
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@submarine.apache.org
For additional commands, e-mail: dev-help@submarine.apache.org