diff options
author | Lusheng Ji <lji@research.att.com> | 2017-09-06 19:38:42 +0000 |
---|---|---|
committer | Lusheng Ji <lji@research.att.com> | 2017-09-06 19:39:13 +0000 |
commit | 98be1435aab87b5da656f32baff13ce650f4f9fe (patch) | |
tree | 82de39bfd9ee5f0690b86050a0722d4cb71c5255 /blueprints | |
parent | 413edb706447d7226d0bca35742f739c7c734378 (diff) |
Expand templates for blueprints
Issue-Id: DCAEGEN2-60
Change-Id: I22f8576b8e85ebe2fda6c245cc92d90bdb907cea
Signed-off-by: Lusheng Ji <lji@research.att.com>
Diffstat (limited to 'blueprints')
-rw-r--r-- | blueprints/DeploymentHandler.yaml | 6 | ||||
-rw-r--r-- | blueprints/cdapbp7.yaml | 4 | ||||
-rw-r--r-- | blueprints/pom.xml | 233 |
3 files changed, 98 insertions, 145 deletions
diff --git a/blueprints/DeploymentHandler.yaml b/blueprints/DeploymentHandler.yaml index 9cf1cd9..d18ad61 100644 --- a/blueprints/DeploymentHandler.yaml +++ b/blueprints/DeploymentHandler.yaml @@ -27,8 +27,8 @@ description: > imports: - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml - - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/docker/2.1.0/node-type.yaml" - - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/relationship/1.0.0/node-type.yaml" + - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/docker/2.1.0/node-type.yaml" + - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/relationship/1.0.0/node-type.yaml" inputs: @@ -41,7 +41,7 @@ inputs: deployment_handler_image: description: Docker image for deployment handler - default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2 }}/org.onap.dcaegen2.platform/deployment-handler:1.0.0-SNAPSHOT' + default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/org.onap.dcaegen2.platform.deployment-handler:1.0' application_config: description: deployment handler application configuration (to override defaults) diff --git a/blueprints/cdapbp7.yaml b/blueprints/cdapbp7.yaml index 85b6e5c..cad5da2 100644 --- a/blueprints/cdapbp7.yaml +++ b/blueprints/cdapbp7.yaml @@ -22,8 +22,8 @@ imports: - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml - http://www.getcloudify.org/spec/openstack-plugin/1.4/plugin.yaml - http://www.getcloudify.org/spec/fabric-plugin/1.4.1/plugin.yaml - - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/dnsdesig/dns_types.yaml - - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/sshkeyshare/sshkey_types.yaml + - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/dnsdesig/dns_types.yaml + - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/sshkeyshare/sshkey_types.yaml inputs: centos7image_id: diff --git a/blueprints/pom.xml b/blueprints/pom.xml index dc921b3..b1cbcef 100644 --- a/blueprints/pom.xml +++ b/blueprints/pom.xml @@ -33,6 +33,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <sonar.skip>true</sonar.skip> <sonar.sources>.</sonar.sources> <!-- customize the SONARQUBE URL --> <!-- sonar.host.url>http://localhost:9000</sonar.host.url --> @@ -48,14 +49,11 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <sonar.inclusions>**/*.js</sonar.inclusions> --> </properties> - <build> <finalName>${project.artifactId}-${project.version}</finalName> <pluginManagement> <plugins> <!-- the following plugins are invoked from oparent, we do not need them --> - - <plugin> <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> @@ -73,68 +71,80 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <skip>true</skip> </configuration> </plugin> - <!-- first disable the default Java plugins at various stages --> - <!-- maven-resources-plugin is called during "*resource" phases by default behavior. it prepares the resources - dir. we do not need it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - - <!-- maven-compiler-plugin is called during "compile" phases by default behavior. we do not need it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - - <!-- maven-jar-plugin is called during "compile" phase by default behavior. we do not need it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> - <executions> - <execution> - <id>default-jar</id> - <phase/> - </execution> - </executions> - </plugin> - - <!-- maven-install-plugin is called during "install" phase by default behavior. it tries to copy stuff under - target dir to ~/.m2. we do not need it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.4</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - - <!-- maven-surefire-plugin is called during "test" phase by default behavior. it triggers junit test. - we do not need it --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.12.4</version> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - - + <!-- maven-resources-plugin is called during "*resource" phases by default behavior. it prepares + the resources dir. we do not need it --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <!-- maven-compiler-plugin is called during "compile" phases by default behavior. we do not need it --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <!-- maven-jar-plugin is called during "compile" phase by default behavior. we do not need it --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <id>default-jar</id> + <phase/> + </execution> + </executions> + </plugin> + <!-- maven-install-plugin is called during "install" phase by default behavior. it tries to copy stuff under + target dir to ~/.m2. we do not need it --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.4</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <!-- maven-surefire-plugin is called during "test" phase by default behavior. it triggers junit test. + we do not need it --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.12.4</version> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <configuration> + <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable> + <environmentVariables> + <!-- make mvn properties as env for our script --> + <MVN_PROJECT_GROUPID>${parent.groupId}</MVN_PROJECT_GROUPID> + <MVN_PROJECT_ARTIFACTID>${parent.artifactId}</MVN_PROJECT_ARTIFACTID> + <MVN_PROJECT_VERSION>${parent.version}</MVN_PROJECT_VERSION> + <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> + <MVN_RAWREPO_BASEURL_UPLOAD>${onap.nexus.rawrepo.baseurl.upload}</MVN_RAWREPO_BASEURL_UPLOAD> + <MVN_RAWREPO_BASEURL_DOWNLOAD>${onap.nexus.rawrepo.baseurl.download}</MVN_RAWREPO_BASEURL_DOWNLOAD> + <MVN_RAWREPO_SERVERID>${onap.nexus.rawrepo.serverid}</MVN_RAWREPO_SERVERID> + <MVN_DOCKERREGISTRY_DAILY>${onap.nexus.dockerregistry.daily}</MVN_DOCKERREGISTRY_DAILY> + <MVN_DOCKERREGISTRY_RELEASE>${onap.nexus.dockerregistry.release}</MVN_DOCKERREGISTRY_RELEASE> + </environmentVariables> + </configuration> + </plugin> </plugins> </pluginManagement> - <plugins> <!-- plugin> <artifactId>maven-assembly-plugin</artifactId> @@ -154,8 +164,6 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. </execution> </executions> </plugin --> - - <!-- now we configure custom action (calling a script) at various lifecycle phases --> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -165,147 +173,92 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <execution> <id>clean phase script</id> <phase>clean</phase> - <goals><goal>exec</goal></goals> + <goals> + <goal>exec</goal> + </goals> <configuration> - <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable> <arguments> <argument>${project.artifactId}</argument> <argument>clean</argument> </arguments> - <environmentVariables> - <!-- make mvn properties as env for our script --> - <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> - <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> - <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> - <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> - <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> - </environmentVariables> </configuration> </execution> - <execution> <id>generate-sources script</id> <phase>generate-sources</phase> - <goals><goal>exec</goal></goals> + <goals> + <goal>exec</goal> + </goals> <configuration> - <executable>mvn-phase-script.sh</executable> <arguments> <argument>${project.artifactId}</argument> <argument>generate-sources</argument> </arguments> - <environmentVariables> - <!-- make mvn properties as env for our script --> - <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> - <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> - <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> - <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> - <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> - </environmentVariables> </configuration> </execution> - <execution> <id>compile script</id> <phase>compile</phase> - <goals><goal>exec</goal></goals> + <goals> + <goal>exec</goal> + </goals> <configuration> - <executable>mvn-phase-script.sh</executable> <arguments> <argument>${project.artifactId}</argument> <argument>compile</argument> </arguments> - <environmentVariables> - <!-- make mvn properties as env for our script --> - <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> - <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> - <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> - <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> - <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> - </environmentVariables> </configuration> </execution> - <execution> <id>package script</id> <phase>package</phase> - <goals><goal>exec</goal></goals> + <goals> + <goal>exec</goal> + </goals> <configuration> - <executable>mvn-phase-script.sh</executable> <arguments> <argument>${project.artifactId}</argument> <argument>package</argument> </arguments> - <environmentVariables> - <!-- make mvn properties as env for our script --> - <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> - <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> - <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> - <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> - <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> - </environmentVariables> </configuration> </execution> - <execution> <id>test script</id> <phase>test</phase> - <goals><goal>exec</goal></goals> + <goals> + <goal>exec</goal> + </goals> <configuration> - <executable>mvn-phase-script.sh</executable> <arguments> <argument>${project.artifactId}</argument> <argument>test</argument> </arguments> - <environmentVariables> - <!-- make mvn properties as env for our script --> - <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> - <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> - <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> - <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> - <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> - </environmentVariables> </configuration> </execution> - <execution> <id>install script</id> <phase>install</phase> - <goals><goal>exec</goal></goals> + <goals> + <goal>exec</goal> + </goals> <configuration> - <executable>mvn-phase-script.sh</executable> <arguments> <argument>${project.artifactId}</argument> <argument>install</argument> </arguments> - <environmentVariables> - <!-- make mvn properties as env for our script --> - <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> - <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> - <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> - <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> - <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> - </environmentVariables> </configuration> </execution> - <execution> <id>deploy script</id> <phase>deploy</phase> - <goals><goal>exec</goal></goals> + <goals> + <goal>exec</goal> + </goals> <configuration> - <executable>mvn-phase-script.sh</executable> <arguments> <argument>${project.artifactId}</argument> <argument>deploy</argument> </arguments> - <environmentVariables> - <!-- make mvn properties as env for our script --> - <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> - <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> - <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> - <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> - <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> - </environmentVariables> </configuration> </execution> </executions> |