Merge "Update global-jjb"

diff --git a/jenkins-scripts/jenkins-init-script.sh b/jenkins-scripts/jenkins-init-script.sh
index 67987b5..dd76d8a 100755 (executable)
--- a/jenkins-scripts/jenkins-init-script.sh
+++ b/jenkins-scripts/jenkins-init-script.sh
@@ -25,3 +25,6 @@ fi
 # Create the jenkins user last so that hopefully we don't have to deal with
 # guard files
 ./create_jenkins_user.sh
+
+# Nexus3 port forwarding rules for ARM64
+./nexus3_port_forwarding.sh

diff --git a/jenkins-scripts/nexus3_port_forwarding.sh b/jenkins-scripts/nexus3_port_forwarding.sh
new file mode 100755 (executable)
index 0000000..31d41b2
--- /dev/null
+++ b/jenkins-scripts/nexus3_port_forwarding.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2019 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+echo "---> nexus3_port_forwarding.sh"
+set +e  # DON'T fail build if script fails.
+
+NEXUS3_IP=`host nexus3.onap.org | awk '/has address/ { print $4 ; exit }'`
+OS_ARCH=$(ANSIBLE_STDOUT_CALLBACK=json ANSIBLE_LOAD_CALLBACK_PLUGINS=1 \
+    ansible all -i "localhost," --connection=local -m setup | jq -r \
+    '.. | .ansible_architecture? | select(type != "null")' \
+    | tr '[:upper:]' '[:lower:]')
+
+
+if [[ "${OS_ARCH}" == "aarch64" ]] ;then
+  echo "os_arch: $OS_ARCH"
+  iptables -t nat -I OUTPUT 1 -p tcp -d ${NEXUS3_IP} --dport 10001 -j DNAT --to-destination ${NEXUS3_IP}:11001
+  iptables -t nat -I OUTPUT 1 -p tcp -d ${NEXUS3_IP} --dport 10002 -j DNAT --to-destination ${NEXUS3_IP}:11002
+  iptables -t nat -I OUTPUT 1 -p tcp -d ${NEXUS3_IP} --dport 10003 -j DNAT --to-destination ${NEXUS3_IP}:11003
+fi
+
+# DON'T fail build if script fails.
+exit 0

diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index a0df507..bcac3f5 100644 (file)
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -47,3 +47,19 @@
     mvn-settings: 'ccsdk-dashboard-settings'
     build-node: centos7-redis-4c-4g
 
+- project:
+    name: ccsdk-dashboard-docker
+    project-name: 'ccsdk-dashboard'
+    jobs:
+      - 'docker-version-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
+    project: 'ccsdk/dashboard'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'ccsdk-dashboard-settings'
+    files: '**'
+    archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: docker
+    build-node: queue-docker-4c-4g

diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index b6fc80b..dd76bd4 100644 (file)
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -8,8 +8,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     functionality:
       - 'healthcheck':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'