diff options
| author |   Jack Lucas <jflucas@research.att.com> | 2019-05-22 10:45:49 -0400 |
|---|---|---|
| committer | Jack Lucas <jflucas@research.att.com> | 2019-05-22 11:58:54 -0400 |
| commit | d9834a145d44a100eb2033889700d17600f54701 (patch) | |
| tree | 2660da394fdc4cb61dca0994d7068d8ab0ae0af8 | |
| parent | 87c27c2e49671a973c2955330d8bd6a04b411331 (diff) | |
Stop building CDAP and Docker plugins
Also remove relationships plugin test case that has different
expected results on Ubuntu and CentOS. (Should not change
test coverage statistics.)
Change-Id: I027e13ee92ff1c799d38d8ad9939c4aff73022c3
Issue-ID: DCAEGEN2-1524
Signed-off-by: Jack Lucas <jflucas@research.att.com>
| -rwxr-xr-x | mvn-phase-script.sh | 4 | ||||
| -rw-r--r-- | pom.xml | 8 | ||||
| -rw-r--r-- | relationships/tests/test_discovery.py | 4 |
3 files changed, 5 insertions, 11 deletions
diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh index 6b3120b..7d4bcdb 100755 --- a/mvn-phase-script.sh +++ b/mvn-phase-script.sh @@ -63,7 +63,7 @@ test) package) echo "==> package phase script" case $MVN_PROJECT_MODULEID in - cdap|dcae-policy|docker|relationships|k8s|clamp-policy) + dcae-policy|k8s|clamp-policy|relationships) build_archives_for_wagons build_wagons ;; @@ -77,7 +77,7 @@ install) deploy) echo "==> deploy phase script" case $MVN_PROJECT_MODULEID in - cdap|dcae-policy|docker|relationships|k8s|clamp-policy) + dcae-policy|k8s|clamp-policy|relationships) upload_wagons_and_type_yamls upload_wagon_archives ;; @@ -32,12 +32,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <url>http://maven.apache.org</url> <packaging>pom</packaging> <modules> - <module>cdap</module> - <module>docker</module> - <module>relationships</module> <module>dcae-policy</module> <module>k8s</module> <module>clamp-policy</module> + <module>relationships</module> </modules> <properties> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> @@ -81,7 +79,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. </configuration> </plugin> <!-- first disable the default Java plugins at various stages --> - <!-- maven-resources-plugin is called during "*resource" phases by default behavior. it prepares + <!-- 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> @@ -112,7 +110,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. </execution> </executions> </plugin> - <!-- maven-install-plugin is called during "install" phase by default behavior. it tries to copy stuff under + <!-- 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> diff --git a/relationships/tests/test_discovery.py b/relationships/tests/test_discovery.py index ae2d34b..808b413 100644 --- a/relationships/tests/test_discovery.py +++ b/relationships/tests/test_discovery.py @@ -38,7 +38,3 @@ def test_create_kv_conn_parse_host(): with pytest.raises(dis.DiscoveryError): dis._parse_host(host) - # Hanging colon - port = "" - host = "{0}:{1}".format(hostname, port) - assert (hostname, 8500) == dis._parse_host(host) |