From: Jimmy Forsyth Date: Tue, 27 Aug 2019 17:31:17 +0000 (-0400) Subject: Fix docker image generation and tagging X-Git-Tag: 5.0.1-ONAP~1 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f99558e7d913a3fdc277f37ea6547b22ba634548;p=aai%2Fgizmo.git Fix docker image generation and tagging Issue-ID: AAI-2579 Signed-off-by: Jimmy Forsyth Change-Id: I749e22447b48c92cf4f2ee0f991ff39146f7b45d --- diff --git a/pom.xml b/pom.xml index e27155a..a801d4d 100644 --- a/pom.xml +++ b/pom.xml @@ -19,19 +19,19 @@ limitations under the License. ============LICENSE_END========================================================= --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.onap.oparent oparent 2.0.0 - + org.onap.aai.gizmo gizmo - 1.5.1-SNAPSHOT + 1.5.2-SNAPSHOT aai-gizmo @@ -45,6 +45,16 @@ limitations under the License. coverage caused by new changes. Note that this figure cannot be lower than the ONAP requirement of 0.55 --> 0.60 ${project.build.directory}/code-coverage + + 0.28.0 + 1.0.0 + ${project.build.directory}/${project.artifactId}-build/ + + onap + alpine + 1.6.0 + + yyyyMMdd'T'HHmmss'Z' @@ -116,21 +126,21 @@ limitations under the License. - - io.swagger - swagger-jersey2-jaxrs - 1.5.8 - - - io.springfox - springfox-swagger2 - 2.9.2 - - - io.springfox - springfox-swagger-ui - 2.9.2 - + + io.swagger + swagger-jersey2-jaxrs + 1.5.8 + + + io.springfox + springfox-swagger2 + 2.9.2 + + + io.springfox + springfox-swagger-ui + 2.9.2 + @@ -145,8 +155,8 @@ limitations under the License. ${version.org.onap.aai.aai-schema-ingest} - org.powermock - * + org.powermock + * @@ -165,7 +175,7 @@ limitations under the License. org.onap.aai.event-client event-client-dmaap - ${event.client.version} + ${event.client.version} org.slf4j @@ -176,7 +186,7 @@ limitations under the License. org.onap.aai.event-client event-client-kafka - ${event.client.version} + ${event.client.version} org.slf4j @@ -186,9 +196,9 @@ limitations under the License. - org.onap.aai.event-client - event-client-rabbitmq - ${event.client.version} + org.onap.aai.event-client + event-client-rabbitmq + ${event.client.version} org.slf4j @@ -363,96 +373,159 @@ limitations under the License. + + + + docker + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + pre-clean + parse-version + + parse-version + + + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + pre-clean + + execute + + + + def userAaiBaseImage = session.userProperties['aai.base.image'] + def userAaiCommonVersion = session.userProperties['aai.base.image.version'] + if (userAaiCommonVersion != null) { + project.properties['aai.base.image.version'] = userAaiCommonVersion + } + if (userAaiBaseImage != null) { + project.properties['aai.base.image'] = userAaiBaseImage + } + log.info 'Base image flavour: ' + project.properties['aai.base.image'] + log.info 'Base image version: ' + project.properties['aai.base.image.version'] + + + + + + + io.fabric8 + docker-maven-plugin + ${docker.fabric.version} + + true + 1.23 + + + ${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l + + + @ + + latest + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-${maven.build.timestamp} + + try + ${project.basedir}/src/main/docker + + + + + ${aai.build.directory} + /${project.artifactId} + + + + + + + + + + + clean-images + pre-clean + + remove + + + true + + + + generate-images + package + + build + + + + push-images + deploy + + push + + + + + + + + + ${project.artifactId} - - - - net.revelc.code.formatter - formatter-maven-plugin - 2.8.1 - + --> + + + net.revelc.code.formatter + formatter-maven-plugin + 2.8.1 + ${project.basedir}/onap-java-formatter.xml - - - - - com.diffplug.spotless - spotless-maven-plugin - 1.18.0 - - - - com,java,javax,org - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.7 - - - copy-docker-file - package - - copy-resources - - - target - true - - - ${basedir}/src/main/docker - true - - **/* - - - - ${basedir} - true - - bundleconfig-local/** - - - - ${basedir}/src/main/bin/ - - - - - + + - + + org.codehaus.groovy.maven + gmaven-plugin + - com.spotify - docker-maven-plugin - 0.4.11 + com.diffplug.spotless + spotless-maven-plugin + 1.18.0 - true - docker-hub - ${docker.push.registry}/onap/${project.artifactId} - ${docker.location} - - latest - - true + + + com,java,javax,org + + + - @@ -516,6 +589,23 @@ limitations under the License. + + maven-assembly-plugin + + + src/main/assembly/descriptor.xml + + + + + make-assembly + package + + single + + + + org.apache.maven.plugins maven-dependency-plugin @@ -534,7 +624,7 @@ limitations under the License. ${version.org.onap.aai.aai-schema} jar onap/**/ - ${project.build.directory}/bundleconfig-local/etc + ${aai.build.directory}/bundleconfig/etc @@ -569,7 +659,8 @@ limitations under the License. - + + diff --git a/src/main/assembly/descriptor.xml b/src/main/assembly/descriptor.xml new file mode 100644 index 0000000..e3a83ed --- /dev/null +++ b/src/main/assembly/descriptor.xml @@ -0,0 +1,36 @@ + + build + false + + dir + + + + ${project.basedir}/bundleconfig-local + /bundleconfig + + **/* + + + + ${project.basedir}/src/main/bin + /bin + + **/* + + + + ${project.build.directory} + / + + *.jar + + + Dockerfile + *.sh + + + + diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index b164907..3823a6c 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -1,51 +1,26 @@ -FROM ubuntu:14.04 +FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@ ARG MICRO_HOME=/opt/app/crud-api ARG BIN_HOME=$MICRO_HOME/bin +ARG USERS_HOME=/opt/aaihome -RUN apt-get update - -# Install and setup java8 -RUN apt-get update && apt-get install -y software-properties-common -## sudo -E is required to preserve the environment. If you remove that line, it will most like freeze at this step -RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk -## Setup JAVA_HOME, this is useful for docker commandline -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 -RUN export JAVA_HOME - -# Build up the deployment folder structure -RUN mkdir -p $MICRO_HOME -RUN mkdir -p $MICRO_HOME/bundleconfig/etc -COPY gizmo.jar $MICRO_HOME/ -RUN mkdir -p $BIN_HOME -COPY *.sh $BIN_HOME -COPY bundleconfig-local $MICRO_HOME/bundleconfig -COPY bundleconfig-local/etc/logback.xml $MICRO_HOME/bundleconfig/etc -RUN chmod 755 $BIN_HOME/* - -# Changes related to:AAI-2177 -# Change aai gizmo container processes to run as non-root on the host +# AAI-2177: Change aai gizmo container processes to run as non-root on the host #Note:The group id and user id used below (492382 & 341790 respectively) are chosen arbitarily based on assumption that # these are not used elsewhere. Please see https://jira.onap.org/browse/AAI-2172 for more background on this. -RUN mkdir /opt/aaihome && \ - groupadd -g 492382 aaiadmin && \ - useradd -r -u 341790 -g 492382 -ms /bin/sh -d /opt/aaihome/aaiadmin aaiadmin && \ - - ##The following 2 lines are added to add the user to the sudoers group - ##The script src\main\bin\start.sh could then optionally run the process as sudo user if an environment variable is set - ## By default the sudo mode is disabled. - usermod -aG sudo aaiadmin &&\ - echo 'aaiadmin ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && \ - chown -R aaiadmin:aaiadmin $MICRO_HOME &&\ - mkdir /logs && \ - chown -R aaiadmin:aaiadmin /logs +RUN mkdir -p $MICRO_HOME $USERS_HOME /logs \ + && groupadd -g 492382 aaiadmin \ + && useradd -r -u 341790 -g 492382 -ms /bin/sh -d $USERS_HOME/aaiadmin aaiadmin +WORKDIR $MICRO_HOME +COPY /maven/gizmo/ . +RUN chmod 755 $BIN_HOME/* \ + && ln -snf /logs $MICRO_HOME/logs \ + && chown -R aaiadmin:aaiadmin $MICRO_HOME /logs USER aaiadmin -RUN ln -s /logs $MICRO_HOME/logs - EXPOSE 9520 9520 CMD ["/opt/app/crud-api/bin/start.sh"] + diff --git a/src/test/java/org/onap/crud/event/response/GraphEventResponseHandlerTest.java b/src/test/java/org/onap/crud/event/response/GraphEventResponseHandlerTest.java index 5f9194f..6fc390e 100644 --- a/src/test/java/org/onap/crud/event/response/GraphEventResponseHandlerTest.java +++ b/src/test/java/org/onap/crud/event/response/GraphEventResponseHandlerTest.java @@ -19,11 +19,16 @@ * ============LICENSE_END========================================================= */ package org.onap.crud.event.response; -import static org.assertj.core.api.Assertions.assertThat; + +import com.google.gson.Gson; +import com.google.gson.JsonParser; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.mockito.junit.MockitoJUnitRunner; +import org.onap.crud.OXMModelLoaderSetup; import org.onap.crud.event.GraphEvent; import org.onap.crud.event.GraphEvent.GraphEventOperation; import org.onap.crud.event.envelope.GraphEventEnvelope; @@ -31,82 +36,79 @@ import org.onap.crud.exception.CrudException; import org.onap.crud.util.TestUtil; import org.onap.schema.EdgeRulesLoader; import org.onap.schema.OxmModelLoader; -import com.google.gson.Gson; -import com.google.gson.JsonParser; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; -import org.onap.crud.OXMModelLoaderSetup; +import static org.assertj.core.api.Assertions.assertThat; @RunWith(MockitoJUnitRunner.Silent.class) public class GraphEventResponseHandlerTest extends OXMModelLoaderSetup { private static boolean setUpIsNotDone = true; - @Rule - public ExpectedException expectedException = ExpectedException.none(); + @Before + public void setUpOnce() throws CrudException { + if (setUpIsNotDone) { + System.setProperty("CONFIG_HOME", "src/test/resources"); + System.setProperty("AJSC_HOME", "."); + System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - @Before - public void setUpOnce() throws Exception { - if (setUpIsNotDone) { - System.setProperty("CONFIG_HOME", "src/test/resources"); - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); + OxmModelLoader.loadModels(); + EdgeRulesLoader.loadModels(); - OxmModelLoader.loadModels(); - EdgeRulesLoader.loadModels(); - setUpIsNotDone = false; + setUpIsNotDone = false; + } } - } - @Test - public void testPolicyViolationsNotDetected() throws Exception { - String expectedEnvelope = TestUtil.getFileAsString("event/event-envelope-sentinel-no-violations.json"); - Gson gson = new Gson(); - GraphEventEnvelope envelope = gson.fromJson(expectedEnvelope, GraphEventEnvelope.class); + @Rule + public ExpectedException expectedException = ExpectedException.none(); - GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler(); - assertThat(graphEventResponseHandler.hasPolicyViolations(envelope)).isFalse(); - } + @Test + public void testPolicyViolationsNotDetected() throws Exception { + String expectedEnvelope = TestUtil.getFileAsString("event/event-envelope-sentinel-no-violations.json"); + Gson gson = new Gson(); + GraphEventEnvelope envelope = gson.fromJson(expectedEnvelope, GraphEventEnvelope.class); - @Test - public void testPolicyViolationsDetected() throws Exception { - String expectedEnvelope = TestUtil.getFileAsString("event/event-envelope-sentinel.json"); - Gson gson = new Gson(); - GraphEventEnvelope envelope = gson.fromJson(expectedEnvelope, GraphEventEnvelope.class); + GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler(); + assertThat(graphEventResponseHandler.hasPolicyViolations(envelope)).isFalse(); + } - GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler(); - assertThat(graphEventResponseHandler.hasPolicyViolations(envelope)).isTrue(); - } + @Test + public void testPolicyViolationsDetected() throws Exception { + String expectedEnvelope = TestUtil.getFileAsString("event/event-envelope-sentinel.json"); + Gson gson = new Gson(); + GraphEventEnvelope envelope = gson.fromJson(expectedEnvelope, GraphEventEnvelope.class); - @Test - public void testHandleVertexResponse() throws Exception { - String graphEvent = TestUtil.getFileAsString("event/graph-vertex-event.json"); - String champResult = TestUtil.getFileAsString("event/champ-vertex-event.json"); - Gson gson = new Gson(); - GraphEvent event = gson.fromJson(graphEvent, GraphEvent.class); - GraphEventEnvelope result = gson.fromJson(champResult, GraphEventEnvelope.class); + GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler(); + assertThat(graphEventResponseHandler.hasPolicyViolations(envelope)).isTrue(); + } - GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler(); - String response = graphEventResponseHandler.handleVertexResponse("v13", event, result); + @Test + public void testHandleVertexResponse() throws Exception { + String graphEvent = TestUtil.getFileAsString("event/graph-vertex-event.json"); + String champResult = TestUtil.getFileAsString("event/champ-vertex-event.json"); + Gson gson = new Gson(); + GraphEvent event = gson.fromJson(graphEvent, GraphEvent.class); + GraphEventEnvelope result = gson.fromJson(champResult, GraphEventEnvelope.class); - assertThat(new JsonParser().parse(response).getAsJsonObject().get("url").getAsString()) + GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler(); + String response = graphEventResponseHandler.handleVertexResponse("v13", event, result); + + assertThat(new JsonParser().parse(response).getAsJsonObject().get("url").getAsString()) .isEqualTo("services/inventory/v13/pserver/890c8b3f-892f-48e3-85cd-748ebf0426a5"); - } + } - @Test - public void testHandleVertexResponseWithError() throws Exception { - expectedException.expect(CrudException.class); - expectedException.expectMessage("test error"); + @Test + public void testHandleVertexResponseWithError() throws Exception { + expectedException.expect(CrudException.class); + expectedException.expectMessage("test error"); - String graphEvent = TestUtil.getFileAsString("event/graph-vertex-event.json"); - String champResult = TestUtil.getFileAsString("event/champ-vertex-event-error.json"); - Gson gson = new Gson(); - GraphEvent event = gson.fromJson(graphEvent, GraphEvent.class); - GraphEventEnvelope result = gson.fromJson(champResult, GraphEventEnvelope.class); + String graphEvent = TestUtil.getFileAsString("event/graph-vertex-event.json"); + String champResult = TestUtil.getFileAsString("event/champ-vertex-event-error.json"); + Gson gson = new Gson(); + GraphEvent event = gson.fromJson(graphEvent, GraphEvent.class); + GraphEventEnvelope result = gson.fromJson(champResult, GraphEventEnvelope.class); - GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler(); - graphEventResponseHandler.handleVertexResponse("v13", event, result); - } + GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler(); + graphEventResponseHandler.handleVertexResponse("v13", event, result); + } @Test(expected = CrudException.class) public void testHandleVertexResponseWithViolations() throws Exception { @@ -121,33 +123,33 @@ public class GraphEventResponseHandlerTest extends OXMModelLoaderSetup { graphEventResponseHandler.handleVertexResponse("v13", event, result); } - @Test - public void testHandleEdgeResponse() throws Exception { - String graphEvent = TestUtil.getFileAsString("event/graph-edge-event.json"); - String champResult = TestUtil.getFileAsString("event/champ-edge-event.json"); - Gson gson = new Gson(); - GraphEvent event = gson.fromJson(graphEvent, GraphEvent.class); - GraphEventEnvelope result = gson.fromJson(champResult, GraphEventEnvelope.class); + @Test + public void testHandleEdgeResponse() throws Exception { + String graphEvent = TestUtil.getFileAsString("event/graph-edge-event.json"); + String champResult = TestUtil.getFileAsString("event/champ-edge-event.json"); + Gson gson = new Gson(); + GraphEvent event = gson.fromJson(graphEvent, GraphEvent.class); + GraphEventEnvelope result = gson.fromJson(champResult, GraphEventEnvelope.class); - GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler(); - String response = graphEventResponseHandler.handleEdgeResponse("v10", event, result); + GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler(); + String response = graphEventResponseHandler.handleEdgeResponse("v10", event, result); - String id = new JsonParser().parse(response).getAsJsonObject().get("id").getAsString(); - assertThat(id).isEqualTo("test-key"); - } + String id = new JsonParser().parse(response).getAsJsonObject().get("id").getAsString(); + assertThat(id).isEqualTo("test-key"); + } - @Test - public void testHandleDeletionResponse() throws Exception { - GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler(); - GraphEvent event = GraphEvent.builder(GraphEventOperation.DELETE).build(); - String response = graphEventResponseHandler.handleDeletionResponse(event, new GraphEventEnvelope(event)); - assertThat(response).isEqualTo(""); - } + @Test + public void testHandleDeletionResponse() throws Exception { + GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler(); + GraphEvent event = GraphEvent.builder(GraphEventOperation.DELETE).build(); + String response = graphEventResponseHandler.handleDeletionResponse(event, new GraphEventEnvelope(event)); + assertThat(response).isEqualTo(""); + } - @Test - public void testHandleBulkEventResponse() throws Exception { - GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler(); - GraphEvent event = GraphEvent.builder(GraphEventOperation.CREATE).build(); - graphEventResponseHandler.handleBulkEventResponse(event, new GraphEventEnvelope(event)); - } + @Test + public void testHandleBulkEventResponse() throws Exception { + GraphEventResponseHandler graphEventResponseHandler = new GraphEventResponseHandler(); + GraphEvent event = GraphEvent.builder(GraphEventOperation.CREATE).build(); + graphEventResponseHandler.handleBulkEventResponse(event, new GraphEventEnvelope(event)); + } } diff --git a/version.properties b/version.properties index f78f30b..45a2df9 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1 minor=5 -patch=1 +patch=2 base_version=${major}.${minor}.${patch}