diff options
| author |   Carsten Lund <lund@research.att.com> | 2017-02-24 01:14:09 +0000 |
|---|---|---|
| committer | Carsten Lund <lund@research.att.com> | 2017-02-24 01:14:09 +0000 |
| commit | 3ffc2b325ee3a1112afaa86d529ad6f439b4cde7 (patch) | |
| tree | dc890e769233474e0a384aa203f5fe88ec693b5f | |
| parent | 7abef9cddd039d247e8201ecac45823ef17e1eb7 (diff) | |
Update to fix hostname issue of demo POSTGRES VM
Change-Id: I8396b749d1a0afc532701d7f54d522aa0a33940f
Signed-off-by: Carsten Lund <lund@research.att.com>
| -rw-r--r-- | OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml | 8 | ||||
| -rw-r--r-- | dcae-demo-controller/pom.xml | 50 | ||||
| -rw-r--r-- | pom.xml | 34 | ||||
| -rw-r--r-- | version.properties | 11 |
4 files changed, 28 insertions, 75 deletions
diff --git a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml index 4486c32..ceddb8e 100644 --- a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml +++ b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml @@ -25,12 +25,8 @@ installation-steps: - step: shell command: | - case \\\\\$(hostname -a) in - *openecomp.org*) - sed -i /`hostname`/d /etc/hosts - cat /tmp/vm-*-hosts >> /etc/hosts - ;; - esac + sed -i /`hostname`/d /etc/hosts + cat /tmp/vm-*-hosts >> /etc/hosts apt-get update ; apt-get install -y maven openjdk-8-jdk unzip python-pip pip install pyyaml application-id: root diff --git a/dcae-demo-controller/pom.xml b/dcae-demo-controller/pom.xml index ef29696..c133166 100644 --- a/dcae-demo-controller/pom.xml +++ b/dcae-demo-controller/pom.xml @@ -12,45 +12,25 @@ <maven.compiler.source>1.7</maven.compiler.source> <openecomp.nexus.releases>https://nexus.openecomp.org/content/repositories/releases/</openecomp.nexus.releases> <openecomp.nexus.snapshots>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.snapshots> + <openecomp.nexus.proxy>https://nexus.openecomp.org</openecomp.nexus.proxy> + <openecomp.nexus.staging.serverId>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.staging.serverId> + <openecomp.nexus.staging.profileId>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.staging.profileId> </properties> - <pluginRepositories> - <!-- Black Duck plugin dependencies --> - <pluginRepository> - <id>JCenter</id> - <name>JCenter Repository</name> - <url>http://jcenter.bintray.com</url> - </pluginRepository> - - <pluginRepository> - <id>Restlet</id> - <name>Restlet Repository</name> - <url>http://maven.restlet.com</url> - </pluginRepository> - </pluginRepositories> <build> <plugins> - <!-- blackduck maven plugin --> - <plugin> - <groupId>com.blackducksoftware.integration</groupId> - <artifactId>hub-maven-plugin</artifactId> - <version>1.4.0</version> - <inherited>false</inherited> - <configuration> - <hubProjectName>${project.name}</hubProjectName> - <outputDirectory>${project.basedir}</outputDirectory> - </configuration> - <executions> - <execution> - <id>create-bdio-file</id> - <phase>package</phase> - <goals> - <goal>createHubOutput</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <version>1.6.7</version> + <extensions>true</extensions> + <configuration> + <serverId>${openecomp.nexus.staging.profileId}</serverId> + <nexusUrl>${openecomp.nexus.proxy}</nexusUrl> + <stagingProfileId>${openecomp.nexus.staging.profileId}</stagingProfileId> + </configuration> + </plugin> <!-- site maven plugin --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -236,4 +216,4 @@ <type>jar</type> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> @@ -13,43 +13,9 @@ - <pluginRepositories> - <!-- Black Duck plugin dependencies --> - <pluginRepository> - <id>JCenter</id> - <name>JCenter Repository</name> - <url>http://jcenter.bintray.com</url> - </pluginRepository> - - <pluginRepository> - <id>Restlet</id> - <name>Restlet Repository</name> - <url>http://maven.restlet.com</url> - </pluginRepository> - </pluginRepositories> <build> <plugins> - <!-- blackduck maven plugin --> - <plugin> - <groupId>com.blackducksoftware.integration</groupId> - <artifactId>hub-maven-plugin</artifactId> - <version>1.4.0</version> - <inherited>false</inherited> - <configuration> - <hubProjectName>${project.name}</hubProjectName> - <outputDirectory>${project.basedir}</outputDirectory> - </configuration> - <executions> - <execution> - <id>create-bdio-file</id> - <phase>package</phase> - <goals> - <goal>createHubOutput</goal> - </goals> - </execution> - </executions> - </plugin> <!-- site maven plugin --> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/version.properties b/version.properties new file mode 100644 index 0000000..c0f2742 --- /dev/null +++ b/version.properties @@ -0,0 +1,11 @@ +# Versioning variables +# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) +# because they are used in Jenkins, whose plug-in doesn't support +major=1 +minor=0 +patch=0 +base_version=${major}.${minor}.${patch} +# Release must be completed with git revision # in Jenkins + +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT |