change ccsdk image for Neon
SR1
Issue-ID: APPC-1749
Change-Id: I2716e8f58464f5b24b13adb848a694d3dd9512f4
Signed-off-by: Taka Cho <takamune.cho@att.com>
# ============LICENSE_END============================================
# Base ubuntu with added packages needed for ONAP
# ============LICENSE_END============================================
# Base ubuntu with added packages needed for ONAP
-FROM onap/ccsdk-odlsli-alpine-image:0.5.4
+FROM onap/ccsdk-odlsli-alpine-image:0.6.3
MAINTAINER APP-C Team (appc@lists.openecomp.org)
# run as root to install ps to comply with karaf scripts
USER root
RUN apk add --no-cache procps
MAINTAINER APP-C Team (appc@lists.openecomp.org)
# run as root to install ps to comply with karaf scripts
USER root
RUN apk add --no-cache procps
+RUN apk add --no-cache openssh
+RUN apk add --no-cache sshpass
# Set the Env. Variable in the container to add the APPC CONFIG DIR (the SDNC_CONFIG_DIR is inherited from SDNC Image)
ENV APPC_CONFIG_DIR /opt/onap/appc/data/properties
# Set the Env. Variable in the container to add the APPC CONFIG DIR (the SDNC_CONFIG_DIR is inherited from SDNC Image)
ENV APPC_CONFIG_DIR /opt/onap/appc/data/properties
sleep ${SLEEP_TIME}
echo "Checking that Karaf can be accessed"
sleep ${SLEEP_TIME}
echo "Checking that Karaf can be accessed"
-clientOutput=$(${ODL_HOME}/bin/client shell:echo KarafLoginCheckIsWorking)
+##clientOutput=$(${ODL_HOME}/bin/client shell:echo KarafLoginCheckIsWorking)
+clientOutput=$(sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "shell:echo KarafLoginCheckIsWorking")
if echo "$clientOutput" | grep -q "KarafLoginCheckIsWorking"; then
echo "Karaf login succeeded"
else
if echo "$clientOutput" | grep -q "KarafLoginCheckIsWorking"; then
echo "Karaf login succeeded"
else
function featureInstall {
COUNT=0
while [ $COUNT -lt 10 ]; do
function featureInstall {
COUNT=0
while [ $COUNT -lt 10 ]; do
- ${ODL_HOME}/bin/client feature:install $1 2> /tmp/installErr
+sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:install $1" 2> /tmp/installErr
+# ${ODL_HOME}/bin/client feature:install $1 2> /tmp/installErr
cat /tmp/installErr
if grep -q 'Failed to get the session' /tmp/installErr; then
sleep 10
cat /tmp/installErr
if grep -q 'Failed to get the session' /tmp/installErr; then
sleep 10
function waitForKaraf {
COUNT=0
while [ $COUNT -lt 20 ]; do
function waitForKaraf {
COUNT=0
while [ $COUNT -lt 20 ]; do
- ${ODL_HOME}/bin/client feature:list $1 2> /tmp/installErr
+sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:list $1" 2> /tmp/installErr
+# ${ODL_HOME}/bin/client feature:list $1 2> /tmp/installErr
cat /tmp/installErr
if grep -q 'Failed to get the session' /tmp/installErr; then
sleep 10
cat /tmp/installErr
if grep -q 'Failed to get the session' /tmp/installErr; then
sleep 10
echo "Installing features: ${group1Features}"
start=$(date +%s)
echo "Installing features: ${group1Features}"
start=$(date +%s)
- ${ODL_HOME}/bin/client "feature:install -r ${group1Features}"
+sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:install -r ${group1Features}"
+# ${ODL_HOME}/bin/client "feature:install -r ${group1Features}"
end=$(date +%s)
echo "Install of features took $(expr $end - $start) seconds"
sleep 7s
end=$(date +%s)
echo "Install of features took $(expr $end - $start) seconds"
sleep 7s
echo "Installing dispatcher features"
start=$(date +%s)
echo "Installing dispatcher features"
start=$(date +%s)
- ${ODL_HOME}/bin/client "feature:install -r onap-appc-request-handler onap-appc-command-executor onap-appc-lifecycle-management onap-appc-workflow-management lock-manager onap-appc-provider"
+sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:install -r onap-appc-request-handler onap-appc-command-executor onap-appc-lifecycle-management onap-appc-workflow-management lock-manager onap-appc-provider"
+# ${ODL_HOME}/bin/client "feature:install -r onap-appc-request-handler onap-appc-command-executor onap-appc-lifecycle-management onap-appc-workflow-management lock-manager onap-appc-provider"
end=$(date +%s)
echo "Install of dispatcher features took $(expr $end - $start) seconds"
sleep 7s
end=$(date +%s)
echo "Install of dispatcher features took $(expr $end - $start) seconds"
sleep 7s
echo "Installing features: ${group2Features}"
start=$(date +%s)
echo "Installing features: ${group2Features}"
start=$(date +%s)
- ${ODL_HOME}/bin/client "feature:install -r ${group2Features}"
+sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:install -r ${group2Features}"
+# ${ODL_HOME}/bin/client "feature:install -r ${group2Features}"
end=$(date +%s)
echo "Install of features took $(expr $end - $start) seconds"
sleep 7s
end=$(date +%s)
echo "Install of features took $(expr $end - $start) seconds"
sleep 7s
echo "Installing features: ${group3Features}"
start=$(date +%s)
echo "Installing features: ${group3Features}"
start=$(date +%s)
- ${ODL_HOME}/bin/client "feature:install -r ${group3Features}"
+sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:install -r ${group3Features}"
+# ${ODL_HOME}/bin/client "feature:install -r ${group3Features}"
end=$(date +%s)
echo "Install of features took $(expr $end - $start) seconds"
sleep 7s
end=$(date +%s)
echo "Install of features took $(expr $end - $start) seconds"
sleep 7s
APPC_VERSION=${APPC_VERSION:-0.0.1}
APPC_CDT_VERSION=${APPC_CDT_VERSION:-0.0.1}
APPC_OAM_VERSION=${APPC_OAM_VERSION:-0.1.1}
APPC_VERSION=${APPC_VERSION:-0.0.1}
APPC_CDT_VERSION=${APPC_CDT_VERSION:-0.0.1}
APPC_OAM_VERSION=${APPC_OAM_VERSION:-0.1.1}
-AAF_SHIRO_VERSION=${AAF_SHIRO_VERSION:-2.1.7-SNAPSHOT}
+#AAF_SHIRO_VERSION=${AAF_SHIRO_VERSION:-2.1.7-SNAPSHOT}
tmpDir=/tmp/appc-${APPC_VERSION}
tmpDir=/tmp/appc-${APPC_VERSION}
mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc.plugins:dg-loader-provider:${APPC_VERSION}:jar:jar-with-dependencies -DoutputDirectory=${targetDir}/data
mv ${targetDir}/data/dg-loader-provider-*-jar-with-dependencies.jar ${targetDir}/data/dg-loader-provider-jar-with-dependencies.jar
mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc.plugins:dg-loader-provider:${APPC_VERSION}:jar:jar-with-dependencies -DoutputDirectory=${targetDir}/data
mv ${targetDir}/data/dg-loader-provider-*-jar-with-dependencies.jar ${targetDir}/data/dg-loader-provider-jar-with-dependencies.jar
-echo "Downloading aaf-cadi-shiro from nexus"
-mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.aaf.cadi:aaf-shiro-aafrealm-osgi-bundle:${AAF_SHIRO_VERSION} -DoutputDirectory=${targetDir}/data
-mv ${targetDir}/data/aaf-shiro-aafrealm-osgi-bundle-*.jar ${targetDir}/data/aaf-shiro-aafrealm-osgi-bundle.jar
+# installed from CCSDK in El Alto release
+#echo "Downloading aaf-cadi-shiro from nexus"
+#mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.aaf.cadi:aaf-shiro-aafrealm-osgi-bundle:${AAF_SHIRO_VERSION} -DoutputDirectory=${targetDir}/data
+#mv ${targetDir}/data/aaf-shiro-aafrealm-osgi-bundle-*.jar ${targetDir}/data/aaf-shiro-aafrealm-osgi-bundle.jar
echo "Setting keyfile to readonly"
chmod 400 ${targetDir}/data/stores/org.onap.appc.keyfile
echo "Setting keyfile to readonly"
chmod 400 ${targetDir}/data/stores/org.onap.appc.keyfile
-echo "Copying the aaa shiro configuration into opendaylight"
-cp ${APPC_HOME}/data/aaa-app-config.xml ${ODL_HOME}/etc/opendaylight/datastore/initial/config/aaa-app-config.xml
+#echo "Copying the aaa shiro configuration into opendaylight"
+#cp ${APPC_HOME}/data/aaa-app-config.xml ${ODL_HOME}/etc/opendaylight/datastore/initial/config/aaa-app-config.xml
echo "Adding a property system.properties for AAF cadi.properties location"
echo "" >> ${ODL_HOME}/etc/system.properties
echo "Adding a property system.properties for AAF cadi.properties location"
echo "" >> ${ODL_HOME}/etc/system.properties