Merge "change package search path"

diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml
index 24377cc..823d242 100644 (file)
--- a/jjb/hicn/hicn.yaml
+++ b/jjb/hicn/hicn.yaml
@@ -275,14 +275,3 @@
           rerun-unstable-builds: false
           max-failed-builds: 1
           fixed-delay: 90
-
-- project:
-    name: 'hicn-sonar'
-    project: hicn
-    project-name: hicn
-    mvn-settings: hicn
-    mvn-version: 'mvn33-new'
-    branch: master
-    build-node: ubuntu1604-basebuild-4c-4g
-    jobs:
-      - gerrit-maven-sonar

diff --git a/jjb/rpm_dpdk/rpm_dpdk.yaml b/jjb/rpm_dpdk/rpm_dpdk.yaml
index 846a1c5..f1d0000 100644 (file)
--- a/jjb/rpm_dpdk/rpm_dpdk.yaml
+++ b/jjb/rpm_dpdk/rpm_dpdk.yaml
@@ -16,16 +16,16 @@
           repo-stream-part: 'master'
 
 - project:
-    name: rpm-dpdk-view
+    name: rpm_dpdk-view
     views:
       - project-view:
-    project-name: rpm-dpdk
+    project-name: rpm_dpdk
 
 - job-template:
     name: 'rpm_dpdk-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -72,7 +72,7 @@
     name: 'rpm_dpdk-verify-image-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -132,7 +132,7 @@
     name: 'rpm_dpdk-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'