diff options
| -rw-r--r-- | integration-tests/pom.xml | 2 | ||||
| -rw-r--r-- | openecomp-be/.gitignore | 1 | ||||
| -rw-r--r-- | openecomp-be/dist/pom.xml | 1 | ||||
| -rw-r--r-- | openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile | 4 | ||||
| -rw-r--r-- | openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh | 42 | ||||
| -rw-r--r-- | openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml | 31 | ||||
| -rw-r--r-- | openecomp-be/pom.xml | 1 | ||||
| -rw-r--r-- | openecomp-be/tools/install/database/alter_tables.cql | 1 | ||||
| -rw-r--r-- | openecomp-be/tools/install/database/upgrade-scripts/20191103-dox.package_details.cql | 1 |
9 files changed, 62 insertions, 22 deletions
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 5a80dcd26c..1656e28bce 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -544,7 +544,7 @@ limitations under the License. </volumes> <wait> <time>30000</time> - <log>Initializing onboard schemas</log> + <log>Onboarding init was successful</log> </wait> <network> <mode>custom</mode> diff --git a/openecomp-be/.gitignore b/openecomp-be/.gitignore index 2c9567e1a0..ab9a3f3ccc 100644 --- a/openecomp-be/.gitignore +++ b/openecomp-be/.gitignore @@ -11,3 +11,4 @@ package *.iml *.ipr *.iws +/dist/sdc-onboard-db-init-docker/artifacts/upgrade-scripts/ diff --git a/openecomp-be/dist/pom.xml b/openecomp-be/dist/pom.xml index 706f013743..83208a0a4a 100644 --- a/openecomp-be/dist/pom.xml +++ b/openecomp-be/dist/pom.xml @@ -3,7 +3,6 @@ <modelVersion>4.0.0</modelVersion> <name>openecomp-sdc-docker-dist</name> - <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-docker-dist</artifactId> <packaging>pom</packaging> 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 8408d2f51c..05034e1565 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile @@ -32,8 +32,8 @@ USER sdc COPY --chown=sdc:sdc init_keyspaces.cql /home/sdc/ COPY --chown=sdc:sdc init_schemas.cql /home/sdc/ -COPY --chown=sdc:sdc alter_tables.cql /home/sdc/ -COPY --chown=sdc:sdc startup.sh /home/sdc/ +COPY --chown=sdc:sdc upgrade-scripts /home/sdc/upgrade-scripts +COPY --chown=sdc:sdc startup.sh /home/sdc/ RUN chmod 770 /home/sdc/startup.sh diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh index 92bf869ccc..3856e10f89 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh @@ -1,38 +1,50 @@ #!/bin/sh - -cd /home/sdc +SDC_HOME="/home/sdc" +cd $SDC_HOME || { echo "$(date) Failed to access directory $SDC_HOME"; exit 1; } CS_PORT="" CS_HOST=127.0.0.1 -if [ ! -z "${CS_HOST_IP}" ]; then +if [ -n "${CS_HOST_IP}" ]; then CS_HOST=$CS_HOST_IP fi -if [ ! -z "${CS_HOST_PORT}" ]; then +if [ -n "${CS_HOST_PORT}" ]; then CS_PORT=$CS_HOST_PORT fi -echo "[Info] Going to initialize sdc onboard cassandra: user=$SDC_USER; host=$CS_HOST; port=$CS_PORT" +echo "$(date) [Info] Going to initialize sdc onboard cassandra: user=$SDC_USER; host=$CS_HOST; port=$CS_PORT" -echo "[Info] Initializing onboard keyspaces" -date; -cqlsh -u $SDC_USER -p $SDC_PASSWORD -f init_keyspaces.cql $CS_HOST $CS_PORT +echo "$(date) [Info] Initializing onboard keyspaces" +cqlsh -u "$SDC_USER" -p "$SDC_PASSWORD" -f init_keyspaces.cql "$CS_HOST" "$CS_PORT" rc=$? -date; if [ $rc != 0 ]; then - echo "[Error] Failed to initialize onboard keyspaces"; + echo "$(date) [Error] Failed to initialize onboard keyspaces"; exit $rc; fi +echo "$(date) [Info] Finished initializing onboard keyspaces" -echo "[Info] Initializing onboard schemas" -date; -cqlsh -u $SDC_USER -p $SDC_PASSWORD -f init_schemas.cql $CS_HOST $CS_PORT +echo "$(date) [Info] Initializing onboard schemas" +cqlsh -u "$SDC_USER" -p "$SDC_PASSWORD" -f init_schemas.cql "$CS_HOST" "$CS_PORT" rc=$? -date; if [ $rc != 0 ]; then - echo "[Error] Failed to initialize onboard schemas"; + echo "$(date) [Error] Failed to initialize onboard schemas"; exit $rc; fi +echo "$(date) [Info] Finished initializing onboard schemas" + +echo "$(date) [Info] Upgrading onboard schemas" +for entry in "$SDC_HOME/upgrade-scripts"/* +do + echo "$(date) Running upgrade file '$entry'" + cqlsh -u "$SDC_USER" -p "$SDC_PASSWORD" -f "$entry" "$CS_HOST" "$CS_PORT" + rc=$? + if [ $rc != 0 ]; then + echo "$(date) [Warn] Upgrade failed for file '$entry'. It is possible that the upgrade was previously applied."; + fi + echo "$(date) Successfully ran upgrade file '$entry'" +done + +echo "$(date) [Info] Onboarding init was successful"
\ No newline at end of file diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml index e4ea7a7859..7ceb47082e 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml @@ -3,7 +3,6 @@ <modelVersion>4.0.0</modelVersion> <name>openecomp-sdc-docker-db-init</name> - <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-docker-db-init</artifactId> <packaging>pom</packaging> @@ -27,6 +26,34 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <executions> + <execution> + <id>clean-docker-artifacts</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <filesets> + <fileset> + <directory> + artifacts + </directory> + <followSymlinks>false</followSymlinks> + <includes> + <include>init_keyspaces.cql</include> + <include>init_schemas.cql</include> + <include>upgrade-scripts/**</include> + </includes> + </fileset> + </filesets> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-resources-plugin</artifactId> <version>3.0.2</version> <executions> @@ -46,7 +73,7 @@ <includes> <include>init_keyspaces.cql</include> <include>init_schemas.cql</include> - <include>alter_tables.cql</include> + <include>upgrade-scripts/**</include> </includes> </resource> </resources> diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml index c942349891..ace220474e 100644 --- a/openecomp-be/pom.xml +++ b/openecomp-be/pom.xml @@ -87,6 +87,7 @@ <module>/tools/swagger-ui</module> <module>/tools/zusammen-tools</module> <module>/backend</module> + <module>/dist</module> </modules> <profiles> diff --git a/openecomp-be/tools/install/database/alter_tables.cql b/openecomp-be/tools/install/database/alter_tables.cql deleted file mode 100644 index 9363a036f9..0000000000 --- a/openecomp-be/tools/install/database/alter_tables.cql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE dox.package_details ADD RESOURCE_TYPE text; diff --git a/openecomp-be/tools/install/database/upgrade-scripts/20191103-dox.package_details.cql b/openecomp-be/tools/install/database/upgrade-scripts/20191103-dox.package_details.cql new file mode 100644 index 0000000000..1326dc7f80 --- /dev/null +++ b/openecomp-be/tools/install/database/upgrade-scripts/20191103-dox.package_details.cql @@ -0,0 +1 @@ +ALTER TABLE dox.package_details ADD RESOURCE_TYPE text;
\ No newline at end of file |