Force a fixed version of cqlsh in cassandra init

The latest version of cqlsh is not working with the current
sdc-cassandra-init and sdc-onboard-cassandra-init image/container
setup. This change forces the version to the latest functional version,
6.0.0, so it will not take any other future release, avoiding
unpredictable errors.
It also removes duplicate entries of pip upgrade and cqlsh install
in the onboarding cassandra init.

Change-Id: Ibfd6d34f2857653595897c0e0929eea73015232b
Issue-ID: SDC-3852
Signed-off-by: andre.schmid <andre.schmid@est.tech>

diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile
index 979ab6f..f18eb70 100644 (file)
--- a/asdctool/sdc-cassandra-init/Dockerfile
+++ b/asdctool/sdc-cassandra-init/Dockerfile
@@ -10,7 +10,7 @@ USER root
 
 RUN apt-get update --allow-releaseinfo-change && apt-get install -y python-pip && \
     python -m pip install --upgrade pip \
-    pip install cqlsh && \
+    pip install cqlsh==6.0.0 && \
     mkdir ~/.cassandra/ && \
     echo  '[cql]' > ~/.cassandra/cqlshrc  && \
     echo  'version=3.4.4' >> ~/.cassandra/cqlshrc  && \

diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile
index a30cb46..abd09a9 100644 (file)
--- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile
+++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile
@@ -10,13 +10,11 @@ USER root
 
 RUN apt-get update --allow-releaseinfo-change && apt-get install -y python-pip && \
     python -m pip install --upgrade pip \
-    pip install cqlsh && \
+    pip install cqlsh==6.0.0 && \
     mkdir ~/.cassandra/ && \
     echo  '[cql]' > ~/.cassandra/cqlshrc  && \
     echo  'version=3.4.4' >> ~/.cassandra/cqlshrc  && \
     set -ex && \
-    python -m pip install --upgrade pip \
-    pip install cqlsh && \
     apt-get install -y \
     make \
     gcc \