summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-07-17 18:27:19 +0000
committerGerrit Code Review <gerrit@onap.org>2020-07-17 18:27:19 +0000
commit24297a111b10247058150f2947fea13d72d36b5c (patch)
tree0a3343e6a2224ccac0f1644f3a61e9da52c2f52a
parent7691415030010d7d44513e3190233b59fc0facc5 (diff)
parent8e250697e39ada36d39ce967116d27e1f17a805a (diff)
Merge "remove nexus function from entrypoint"
-rw-r--r--controlloop/packages/docker-controlloop/src/main/resources/pdpd-cl-entrypoint.sh53
-rw-r--r--pom.xml6
2 files changed, 6 insertions, 53 deletions
diff --git a/controlloop/packages/docker-controlloop/src/main/resources/pdpd-cl-entrypoint.sh b/controlloop/packages/docker-controlloop/src/main/resources/pdpd-cl-entrypoint.sh
index 9b9218757..6ec9e1d53 100644
--- a/controlloop/packages/docker-controlloop/src/main/resources/pdpd-cl-entrypoint.sh
+++ b/controlloop/packages/docker-controlloop/src/main/resources/pdpd-cl-entrypoint.sh
@@ -16,58 +16,11 @@
# limitations under the License.
# ########################################################################
-function nexus {
- if [[ ${DEBUG} == y ]]; then
- echo "-- ${FUNCNAME[0]} --"
- set -x
- fi
-
- if [[ -z ${RELEASE_REPOSITORY_URL} ]]; then
- return 0
- fi
-
- # amsterdam legacy
-
- echo
- echo "checking if there are amsterdam policies already deployed .."
- echo
-
- local amsterdamVersion=$(curl --silent --connect-timeout 20 -X GET \
- "http://nexus:8081/nexus/service/local/artifact/maven/resolve?r=releases&g=org.onap.policy-engine.drools.amsterdam&a=policy-amsterdam-rules&v=RELEASE" \
- | grep -Po "(?<=<version>).*(?=</version>)")
-
- if [[ -z ${amsterdamVersion} ]]; then
- echo "no amsterdam policies have been found .."
- exit 0
- fi
-
- echo
- echo "The latest deployed amsterdam artifact in nexus has version ${amsterdamVersion}"
- echo
-
- sed -i.INSTALL \
- -e "s/^rules.artifactId=.*/rules.artifactId=policy-amsterdam-rules/g" \
- -e "s/^rules.groupId=.*/rules.groupId=org.onap.policy-engine.drools.amsterdam/g" \
- -e "s/^rules.version=.*/rules.version=${amsterdamVersion}/g" "${POLICY_HOME}"/config/amsterdam-controller.properties
-
- echo
- echo "amsterdam controller will be started brained with maven coordinates:"
- echo
-
- grep "^rules" "${POLICY_HOME}"/config/amsterdam-controller.properties
- echo
- echo
-}
-
if [[ ${DEBUG} == y ]]; then
echo "-- $0 $* --"
set -x
fi
-operation="${1}"
-case "${operation}" in
- nexus) nexus
- ;;
- *) ${POLICY_HOME}/bin/pdpd-entrypoint.sh "$@"
- ;;
-esac
+# placeholder for customizations
+
+${POLICY_HOME}/bin/pdpd-entrypoint.sh "$@"
diff --git a/pom.xml b/pom.xml
index 64b823d6f..74bb6da64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,9 +45,9 @@
<staging.path>content/repositories/staging/</staging.path>
<!-- Project common dependency versions -->
- <version.policy.common>1.7.0</version.policy.common>
- <policy.models.version>2.3.0</policy.models.version>
- <version.policy.drools-pdp>1.7.0</version.policy.drools-pdp>
+ <version.policy.common>1.7.1-SNAPSHOT</version.policy.common>
+ <policy.models.version>2.3.1-SNAPSHOT</policy.models.version>
+ <version.policy.drools-pdp>1.7.1-SNAPSHOT</version.policy.drools-pdp>
</properties>
<build>