Merge "Add dcae configbinding and snmptrap"

diff --git a/jjb/cloud-infra/scripts/oom-upload.sh b/jjb/cloud-infra/scripts/oom-upload.sh
index f12bc917c0c0c30261b550914378e681f1b67d2e..02197cfa90bd659abaf51a5c3cd821283b95b671 100644 (file)
--- a/jjb/cloud-infra/scripts/oom-upload.sh
+++ b/jjb/cloud-infra/scripts/oom-upload.sh
@@ -22,18 +22,19 @@ set -o errexit
 set -o pipefail
 
 ONAP_OOM_GIT_REVISION=$(cd "${WORKSPACE}/build/onap-oom" && git rev-parse --short HEAD)
-ONAP_UMBRELLA_CHART="${WORKSPACE}/build/onap-oom/kubernetes/dist/packages/onap-*${ONAP_OOM_GIT_REVISION}.tgz"
-IMAGES_LIST="${WORKSPACE}/onap-*${ONAP_OOM_GIT_REVISION}_images.txt"
+ONAP_UMBRELLA_CHART=$(find ${WORKSPACE}/build/onap-oom/kubernetes/dist/packages -name onap-*${ONAP_OOM_GIT_REVISION}.tgz)
+IMAGES_LIST=$(find ${WORKSPACE} -maxdepth 1 -name onap-*${ONAP_OOM_GIT_REVISION}_images.txt)
 
 export NORDIX_ARM_REPO="onap"
 export ARTIFACT_ARM_FOLDER="oom"
 export BUILD_IDENTIFIER="${ONAP_OOM_GIT_REVISION}"
 export NORDIX_ARTIFACT_URL="${NORDIX_ARM_HTTPS_URL}/${NORDIX_ARM_REPO}/${ARTIFACT_ARM_FOLDER}/${BUILD_IDENTIFIER}"
 
-# NOTE(cian): Leaving this commented out for the moment.
-#echo "Info  : Pushing ONAP umbrella chart to Nordix Harbor"
-#HELM_BIN="${WORKSPACE}/bin/helm"
-#${HELM_BIN} push "${ONAP_UMBRELLA_CHART}" "${NORDIX_REGISTRY}"
+echo "Info  : Pushing ONAP umbrella chart to Nordix Harbor"
+HELM_BIN="${WORKSPACE}/bin/helm"
+${HELM_BIN} repo remove onaptest || true
+${HELM_BIN} repo add onaptest "${NORDIX_REGISTRY}/chartrepo/onaptest"
+${HELM_BIN} push -f "${ONAP_UMBRELLA_CHART}" --username "${HARBOR_USERNAME}" --password "${HARBOR_PASSWORD}" onaptest
 
 export BUILD_ARTIFACTS="${ONAP_UMBRELLA_CHART} ${IMAGES_LIST}"
 echo "Info  : Uploading ${BUILD_ARTIFACTS} to Nordix ARM ${NORDIX_ARM_REPO} repository"

diff --git a/jjb/nsm/scripts/static-analysis.sh b/jjb/nsm/scripts/static-analysis.sh
index 16274a112c5e2aa44d5099d6c70c2b3ec5ae6992..57a6861363b67272be3af28d1ef29a7cc67b18cf 100755 (executable)
--- a/jjb/nsm/scripts/static-analysis.sh
+++ b/jjb/nsm/scripts/static-analysis.sh
@@ -22,8 +22,11 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
+# source .profile
+source "$HOME/.profile"
+
 # navigate to WORKSPACE which is the root of the Git clone
-cd $WORKSPACE
+cd "$WORKSPACE"
 
 # git show for information purposes
 echo "--------------------------------------------"

diff --git a/jjb/onap/dmaap-messagerouter-mirroragent/dmaap-messagerouter-mirroragent-push-upstream-jobs.yaml b/jjb/onap/dmaap-messagerouter-mirroragent/dmaap-messagerouter-mirroragent-push-upstream-jobs.yaml
deleted file mode 100644 (file)
index 5cd3a1b..0000000
--- a/jjb/onap/dmaap-messagerouter-mirroragent/dmaap-messagerouter-mirroragent-push-upstream-jobs.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2019 Nordix Foundation.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-# this job gets triggered when push-upstream is commented on a change on Nordix Gerrit.
-- project:
-    name: dmaap-messagerouter-mirroragent-push-upstream
-    project: dmaap/messagerouter/mirroragent
-    project-name: dmaap-messagerouter-mirroragent
-
-    jobs:
-      - 'onap-{project-name}-push-upstream'

diff --git a/jjb/onap/dmaap-messagerouter-mirroragent/dmaap-messagerouter-mirroragent-rebase-jobs.yaml b/jjb/onap/dmaap-messagerouter-mirroragent/dmaap-messagerouter-mirroragent-rebase-jobs.yaml
deleted file mode 100644 (file)
index c4cbd52..0000000
--- a/jjb/onap/dmaap-messagerouter-mirroragent/dmaap-messagerouter-mirroragent-rebase-jobs.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2018 Nordix Foundation.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-#
-# this job gets triggered when a change is merged to
-# dmaap/messagerouter/mirroragent project on ONAP Gerrit.
-- project:
-    name: dmaap-messagerouter-mirroragent-rebase
-    project: dmaap/messagerouter/mirroragent
-    project-name: dmaap-messagerouter-mirroragent
-
-    jobs:
-      - 'onap-{project-name}-rebase'

diff --git a/jjb/onap/dmaap-messagerouter-mirroragent/dmaap-messagerouter-mirroragent-verify-jobs.yaml b/jjb/onap/policy-gui/policy-gui-verify-jobs.yaml
similarity index 77%
rename from jjb/onap/dmaap-messagerouter-mirroragent/dmaap-messagerouter-mirroragent-verify-jobs.yaml
rename to jjb/onap/policy-gui/policy-gui-verify-jobs.yaml
index 2f54c9640447a0ffaa6424232b2d2033036f28a9..8d7530f8d551ab9c643d3204ccdf69392a5600e6 100644 (file)
--- a/jjb/onap/dmaap-messagerouter-mirroragent/dmaap-messagerouter-mirroragent-verify-jobs.yaml
+++ b/jjb/onap/policy-gui/policy-gui-verify-jobs.yaml
@@ -1,6 +1,7 @@
 ---
+#
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2018-2019 Nordix Foundation.
+#  Copyright (C) 2021 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,16 +19,16 @@
 # ============LICENSE_END=========================================================
 
 # this job gets triggered when a change is proposed to
-# dmaap/messagerouter/mirroragent- project on Nordix Gerrit.
+# policy/gui project on Nordix Gerrit.
+
 - project:
-    name: dmaap-messagerouter-mirroragent-verify
-    project: dmaap/messagerouter/mirroragent
-    project-name: dmaap-messagerouter-mirroragent
+    name: policy-gui-verify
+    project: policy/gui
+    project-name: policy-gui
 
     stream:
-      - master:
+      - 'master':
           branch: '{stream}'
-          jdk-version: java-8
-
+          jdk-version: java-11
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'