2 files changed, 10 insertions, 2 deletions

diff --git a/scripts/ci/checkout-oe.sh b/scripts/ci/checkout-oe.sh
index a99f235..fdc0e48 100755
--- a/scripts/ci/checkout-oe.sh
+++ b/scripts/ci/checkout-oe.sh
@@ -19,9 +19,11 @@ mkdir -p updater-repo
 
 cd updater-repo
 
-repo init -m "${MANIFEST}.xml" -u "$REMOTE_SOURCE/updater-repo"
+if [ -d .repo/manifests ]; then
+    git -C .repo/manifests reset --hard
+fi
 
-git -C .repo/manifests reset --hard
+repo init -m "${MANIFEST}.xml" -u "$REMOTE_SOURCE/updater-repo"
 
 # patch manifest:
 # - add a new "ats" remote that points to "$REMOTE_SOURCE"
@@ -45,6 +47,7 @@ for pin in $PIN_LIST; do
     IFS=":"
     read -r project rev <<< "$pin"
     xmlstarlet ed --omit-decl -L \
+        -d "/manifest/project[@name=\"$project\"]/@revision" \
         -i "/manifest/project[@name=\"$project\"]/@revision" -t attr -n "revision" -v "$rev" \
         -i "/manifest/project[@name=\"$project\"]" -t attr -n "revision" -v "$rev" \
         "$MANIFEST_FILE"
diff --git a/scripts/ci/oe-selftest.sh b/scripts/ci/oe-selftest.sh
index 66b1fc9..178e7c1 100755
--- a/scripts/ci/oe-selftest.sh
+++ b/scripts/ci/oe-selftest.sh
@@ -17,5 +17,10 @@ export METADIR
 . "${TEST_REPO_DIR}/meta-updater/scripts/envsetup.sh" "${TEST_MACHINE}" "${TEST_BUILD_DIR}"
 
 set -x
+
+# work poky around bug on sumo and thud
+# see https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=d3a94e5b9b3c107cf54d5639071cc6609c002f67
+mkdir -p "tmp/log"
+
 oe-selftest -r "$@"
 )