summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandre.schmid <andre.schmid@est.tech>2020-08-21 11:31:47 +0100
committerSébastien Determe <sebastien.determe@intl.att.com>2020-09-10 15:22:10 +0000
commit662fcbae499d428189bc3246821ed6c773938fce (patch)
tree644ae1eabb28695ff29eea6dec88d6d92dd7200f
parent4fc21a61e8b73c19fa2e211a879a6ab3217cf5bc (diff)
Update sdc start to mount catalog-be plugins
Change-Id: Ic1a0a8b01f1ef4ac23829431bbab7a7e10836ae6 Issue-ID: SDC-3252 Signed-off-by: andre.schmid <andre.schmid@est.tech>
-rw-r--r--integration-tests/pom.xml21
-rwxr-xr-xsdc-os-chef/scripts/docker_run.sh23
2 files changed, 39 insertions, 5 deletions
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index ce38c9ee9c..bceb7bee2e 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -46,6 +46,7 @@ limitations under the License.
<it.sdc.user>asdc_user</it.sdc.user>
<it.sdc.password>Aa1234%^!</it.sdc.password>
<it.chef.config>${project.build.directory}/chef-config</it.chef.config>
+ <it.sdc-be.plugins>${project.build.directory}/plugins/sdc-be</it.sdc-be.plugins>
<it.shared.volume>/tmp/sdc-integration-tests</it.shared.volume>
<it.docker.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
</it.docker.version>
@@ -267,6 +268,25 @@ limitations under the License.
</resources>
</configuration>
</execution>
+ <execution>
+ <id>copy-sdc-be-plugins</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${it.sdc-be.plugins}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../catalog-be-plugins/etsi-nfv-nsd-csar-plugin/target</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>etsi-nfv-nsd-csar-plugin-${version}.jar</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -537,6 +557,7 @@ limitations under the License.
<bind>
<volume>${it.chef.config}:/var/lib/jetty/chef-solo/environments</volume>
<volume>${it.shared.volume}:/var/lib/jetty/logs</volume>
+ <volume>${it.sdc-be.plugins}:/var/lib/jetty/plugins</volume>
</bind>
</volumes>
<wait>
diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh
index 5ea66527ec..3ffc974c74 100755
--- a/sdc-os-chef/scripts/docker_run.sh
+++ b/sdc-os-chef/scripts/docker_run.sh
@@ -313,15 +313,28 @@ function sdc-cs-onboard-init {
#Back-End
function sdc-BE {
DOCKER_NAME="sdc-BE"
- echo "docker run sdc-backend..."
+ IMAGE_NAME="sdc-backend"
+ IMAGE_FULL_NAME="$PREFIX/$IMAGE_NAME:$RELEASE"
+ echo "Running container '$DOCKER_NAME' based on image '$IMAGE_FULL_NAME'..."
if [ ${LOCAL} = false ]; then
- docker pull ${PREFIX}/sdc-backend:${RELEASE}
+ docker pull "$IMAGE_FULL_NAME"
else
- ADDITIONAL_ARGUMENTS=${BE_DEBUG_PORT}
+ ADDITIONAL_ARGUMENTS=${BE_DEBUG_PORT}
fi
- docker run --detach --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env cassandra_ssl_enabled="false" --env JAVA_OPTIONS="${BE_JAVA_OPTIONS}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/BE/:${JETTY_BASE}/logs --volume ${WORKSPACE}/data/environments:${JETTY_BASE}/chef-solo/environments --publish 8443:8443 --publish 8080:8080 ${ADDITIONAL_ARGUMENTS} ${PREFIX}/sdc-backend:${RELEASE}
+
+ docker run --detach --name ${DOCKER_NAME} --env HOST_IP=${IP} \
+ --env ENVNAME="${DEP_ENV}" --env cassandra_ssl_enabled="false" --env JAVA_OPTIONS="${BE_JAVA_OPTIONS}" \
+ --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 \
+ --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} \
+ --volume ${WORKSPACE}/data/logs/BE/:${JETTY_BASE}/logs \
+ --volume ${WORKSPACE}/data/environments:${JETTY_BASE}/chef-solo/environments \
+ --volume "${WORKSPACE}/data/sdc-backend/plugins":${JETTY_BASE}/plugins \
+ --publish 8443:8443 --publish 8080:8080 \
+ ${ADDITIONAL_ARGUMENTS} \
+ "$IMAGE_FULL_NAME"
+
command_exit_status $? ${DOCKER_NAME}
- echo "please wait while BE is starting..."
+ echo "please wait while $DOCKER_NAME is starting..."
monitor_docker ${DOCKER_NAME}
}
#