From 333fb4b9e6526412129c662a5052156b8e7ab0e2 Mon Sep 17 00:00:00 2001 From: markheger Date: Thu, 25 Jun 2020 10:05:38 +0000 Subject: [PATCH 1/3] condaPackages removed, #2495 --- .../opt/python/packages/streamsx/topology/context.py | 3 +-- .../internal/context/streamsrest/EdgeImageContext.java | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/com.ibm.streamsx.topology/opt/python/packages/streamsx/topology/context.py b/com.ibm.streamsx.topology/opt/python/packages/streamsx/topology/context.py index b7217623ef..de5d92e826 100644 --- a/com.ibm.streamsx.topology/opt/python/packages/streamsx/topology/context.py +++ b/com.ibm.streamsx.topology/opt/python/packages/streamsx/topology/context.py @@ -1140,7 +1140,7 @@ class ContextTypes(object): topo = Topology() ... jc = JobConfig() - jc.raw_overlay = {'edgeConfig': {'imageName':'py-sample-app', 'imageTag':'v1.0', 'baseImage':'streams-base-edge-conda-el7:5.3.0.0'}} + jc.raw_overlay = {'edgeConfig': {'imageName':'py-sample-app', 'imageTag':'v1.0', 'baseImage':'streams-base-edge-python-el7:5.3.0.0'}} jc.add(cfg) submit(ContextTypes.EDGE, topo, cfg) @@ -1153,7 +1153,6 @@ class ContextTypes(object): * **imageTag** - [str] name of the image tag * **baseImage** - [str] identify the name of the base image * **pipPackages** - [list] identify one or more Python install packages that are to be included in the image. - * **condaPackages** - [list] identify one or more anaconda packages that are to be included in the image. * **rpms** - [list] identify one or more linux RPMs that are to be included in the image * **locales** - [list] identify one or more locales that are to be included in the image. The first item in the list is the "default" locale. The locales are identified in the java format  __. Example: "en_US" diff --git a/java/src/com/ibm/streamsx/topology/internal/context/streamsrest/EdgeImageContext.java b/java/src/com/ibm/streamsx/topology/internal/context/streamsrest/EdgeImageContext.java index f4d1a68d29..4d78553c69 100644 --- a/java/src/com/ibm/streamsx/topology/internal/context/streamsrest/EdgeImageContext.java +++ b/java/src/com/ibm/streamsx/topology/internal/context/streamsrest/EdgeImageContext.java @@ -52,7 +52,7 @@ public Type getType() { private String edgeConfigBaseImage = null; private JsonArray edgeConfigPipPackages = null; private JsonArray edgeConfigRpms = null; - private JsonArray edgeConfigCondaPackages = null; +// private JsonArray edgeConfigCondaPackages = null; private JsonArray edgeConfigLocales = null; public Instance instance() { return instance;} @@ -80,7 +80,7 @@ private void parseEdgeConfig(JsonObject jco) { edgeConfigBaseImage = (edgeConfig.has("baseImage")) ? edgeConfig.get("baseImage").getAsString() : null; edgeConfigPipPackages = (edgeConfig.has("pipPackages")) ? GsonUtilities.array(edgeConfig, "pipPackages") : null; edgeConfigRpms = (edgeConfig.has("rpms")) ? GsonUtilities.array(edgeConfig, "rpms") : null; - edgeConfigCondaPackages = (edgeConfig.has("condaPackages")) ? GsonUtilities.array(edgeConfig, "condaPackages") : null; +// edgeConfigCondaPackages = (edgeConfig.has("condaPackages")) ? GsonUtilities.array(edgeConfig, "condaPackages") : null; edgeConfigLocales = (edgeConfig.has("locales")) ? GsonUtilities.array(edgeConfig, "locales") : null; } } @@ -202,9 +202,9 @@ protected void postBuildAction(JsonObject deploy, JsonObject jco, JsonObject res if (edgeConfigRpms != null) { buildConfigOverrides.add("rpms", edgeConfigRpms); } - if (edgeConfigCondaPackages != null) { - buildConfigOverrides.add("condaPackages", edgeConfigCondaPackages); - } +// if (edgeConfigCondaPackages != null) { +// buildConfigOverrides.add("condaPackages", edgeConfigCondaPackages); +// } if (edgeConfigLocales != null) { buildConfigOverrides.add("locales", edgeConfigLocales); } From 8ea75e598c3d4fd100fcc63a81338a6d78182853 Mon Sep 17 00:00:00 2001 From: markheger Date: Thu, 25 Jun 2020 10:06:01 +0000 Subject: [PATCH 2/3] CHANGELOG.md updated --- com.ibm.streamsx.topology/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/com.ibm.streamsx.topology/CHANGELOG.md b/com.ibm.streamsx.topology/CHANGELOG.md index c0370336d9..9056e5334b 100644 --- a/com.ibm.streamsx.topology/CHANGELOG.md +++ b/com.ibm.streamsx.topology/CHANGELOG.md @@ -1,6 +1,9 @@ # Changes ========== +## master lastest +* [#2495](https://github.com/IBMStreams/streamsx.topology/issues/2495) edgeConfig: `condaPackages` parameter is not supported anymore + ## v1.15.4 * [#2488](https://github.com/IBMStreams/streamsx.topology/issues/2488) execution context: Make submission time parameters available without serializing the parameter callable From d30f8ac8494c0d3b43a82efbb1ac2577e086b5b8 Mon Sep 17 00:00:00 2001 From: markheger Date: Thu, 25 Jun 2020 10:07:44 +0000 Subject: [PATCH 3/3] CHANGELOG.md updated --- com.ibm.streamsx.topology/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.ibm.streamsx.topology/CHANGELOG.md b/com.ibm.streamsx.topology/CHANGELOG.md index 9056e5334b..f0dd3aee72 100644 --- a/com.ibm.streamsx.topology/CHANGELOG.md +++ b/com.ibm.streamsx.topology/CHANGELOG.md @@ -1,7 +1,7 @@ # Changes ========== -## master lastest +## master latest * [#2495](https://github.com/IBMStreams/streamsx.topology/issues/2495) edgeConfig: `condaPackages` parameter is not supported anymore ## v1.15.4