3 files changed, 10 insertions, 4 deletions
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 203effb4..34b3dff4 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -16,7 +16,6 @@
     templates:
         - basebuild-agl-test-slave
         - basebuild-control-slave
-        - basebuild
 
 - job-template:
     name: ci-management-verify-jjb
@@ -172,7 +171,7 @@
             - 'd28b1f3b-3603-49bc-b837-bb0a2e85d4b8'
       - ansicolor
       - openstack:
-          single-use: false
+          single-use: true
 
     triggers:
       - timed: '00 10 1 * *'
diff --git a/jjb/common/include-agl-auto-conf.sh b/jjb/common/include-agl-auto-conf.sh
index 2d3e96bf..20f5d9fb 100644
--- a/jjb/common/include-agl-auto-conf.sh
+++ b/jjb/common/include-agl-auto-conf.sh
@@ -42,7 +42,7 @@ fi
 
 # PRSERV and HASHSERV for CI
 # but only starting with dunfell / master -> soon jellyfish
-if test x"master" = x"${DISTROBRANCH}" -o test -x"jellyfish" = x"${DISTROBRANCH}" ; then
+if test x"master" = x"${DISTROBRANCH}" -o x"jellyfish" = x"${DISTROBRANCH}" ; then
 
 export PRHASHSERV="10.30.72.18"
 cat << EOF >> conf/auto.conf
@@ -53,4 +53,4 @@ BB_SIGNATURE_HANDLER = "OEEquivHash"
 PRSERV_HOST = "${PRHASHSERV}:8585"
 EOF
 
-fi
-\ No newline at end of file
+fi
diff --git a/jjb/common/include-agl-header.sh b/jjb/common/include-agl-header.sh
index 6e118837..02e9cb92 100644
--- a/jjb/common/include-agl-header.sh
+++ b/jjb/common/include-agl-header.sh
@@ -159,6 +159,13 @@ if test x"h3ulcb-nogfx" = x"$MACHINE"; then
     export TARGETSDKIMAGE="agl-image-ivi-crosssdk"
 fi
 
+if test x"raspberrypi4" = x"${MACHINE}" -a x"master" = x"${TARGETBRANCH}" ; then
+    export TARGETMACHINE="raspberrypi4-64"
+fi
+if test x"raspberrypi4" = x"${MACHINE}" -a x"jellyfish" = x"${TARGETBRANCH}" ; then
+    export TARGETMACHINE="raspberrypi4-64"
+fi
+
 #if $DEBUG; then
 set | grep ^TARGET || true
 set | grep ^GERRIT || true