Merge "Add profile to appc docker stage job"

diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index d52ef08..9a2c190 100644 (file)
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -16,8 +16,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'appc-cdt-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index 77654c7..a4ef267 100644 (file)
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'appc-deployment-settings'
     maven-version: "mvn35"
     files: '**'
@@ -41,8 +39,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'appc-deployment-settings'
     maven-version: "mvn35"
     files: '**'

diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 1e49704..dd7353f 100644 (file)
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -26,8 +26,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'appc-settings'
     maven-version: "mvn35"
     files: '**'

diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml
index 0ff2d48..897028c 100644 (file)
--- a/jjb/appc/appc-parent.yaml
+++ b/jjb/appc/appc-parent.yaml
@@ -22,8 +22,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'appc-parent-settings'
     maven-version: "mvn35"
     build-node: ubuntu1604-builder-2c-1g

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 8edc0e9..1923c76 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -32,6 +32,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'policy-apex-pdp-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
@@ -51,6 +52,7 @@
     project-name: 'policy-apex-pdp'
     branch: 'master'
     mvn-settings: 'policy-apex-pdp-settings'
+    java-version: openjdk11
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
@@ -63,6 +65,7 @@
     project-name: 'policy-apex-pdp'
     branch: 'master'
     mvn-settings: 'policy-apex-pdp-settings'
+    java-version: openjdk11
 
 - project:
     name: policy-apex-pdp-info

diff --git a/jjb/vnfrqts/pre-build-needs.sh b/jjb/vnfrqts/pre-build-needs.sh
index 77099b1..c27b550 100644 (file)
--- a/jjb/vnfrqts/pre-build-needs.sh
+++ b/jjb/vnfrqts/pre-build-needs.sh
@@ -5,4 +5,5 @@ source $WORKSPACE/venv-tox/bin/activate
 pip install --upgrade pip
 pip install -r etc/requirements.txt
 ls
+wget -O docs/data/needs.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json" && echo "Copied newest needs." || exit 1
 tox -e needs
\ No newline at end of file