Revert "build script", should've been on branch

This reverts commit 975ab40786.

release/build_release2.sh

@@ -8,45 +8,36 @@ export GIT_AUTHOR_EMAIL="user@comma.ai"
 
 export GIT_SSH_COMMAND="ssh -i /data/gitkey"
 
-# set CLEAN to build outside of CI
+# Create folders
-if [ ! -z "$CLEAN" ]; then
+rm -rf /data/openpilot
-  # Create folders
+mkdir -p /data/openpilot
-  rm -rf /data/openpilot
+cd /data/openpilot
-  mkdir -p /data/openpilot
+
-  cd /data/openpilot
+# Create git repo
-
+git init
-  # Create git repo
+git remote add origin git@github.com:commaai/openpilot.git
-  git init
+git fetch origin devel
-  git remote add origin git@github.com:commaai/openpilot.git
-  git fetch origin devel-staging
-else
-  cd /data/openpilot
-  git clean -xdf
-  git branch -D release2-staging || true
-fi
-
 git fetch origin release2-staging
 git fetch origin dashcam-staging
 
+# Checkout devel
+#git checkout origin/devel
+#git clean -xdf
+
 # Create release2 with no history
-if [ ! -z "$CLEAN" ]; then
+git checkout --orphan release2-staging origin/devel
-  git checkout --orphan release2-staging origin/devel-staging
-else
-  git checkout --orphan release2-staging
-fi
 
 VERSION=$(cat selfdrive/common/version.h | awk -F\" '{print $2}')
 git commit -m "openpilot v$VERSION"
 
 # Build signed panda firmware
 pushd panda/board/
-#cp -r /tmp/pandaextra /data/openpilot/
+cp -r /tmp/pandaextra /data/openpilot/
-#RELEASE=1 make obj/panda.bin
+RELEASE=1 make obj/panda.bin
-make obj/panda.bin
 mv obj/panda.bin /tmp/panda.bin
 make clean
 mv /tmp/panda.bin obj/panda.bin.signed
-#rm -rf /data/openpilot/pandaextra
+rm -rf /data/openpilot/pandaextra
 popd
 
 # Build stuff
@@ -69,9 +60,6 @@ rm .sconsign.dblite
 # Restore phonelibs
 git checkout phonelibs/
 
-# Remove the stuff needed to build release
-rm -rf release/
-
 # Mark as prebuilt release
 touch prebuilt
 
@@ -82,17 +70,11 @@ git commit --amend -m "openpilot v$VERSION"
 # Print committed files that are normally gitignored
 #git status --ignored
 
-if [ ! -z "$CI_PUSH" ]; then
+# Push to release2-staging
-  git remote set-url origin git@github.com:commaai/openpilot.git
+git push -f origin release2-staging
-
-  # Push to release2-staging
-  #git push -f origin release2-staging
-  git push -f origin release2-staging:r2_staging_test
 
-  # Create dashcam release
+# Create dashcam release
-  git rm selfdrive/car/*/carcontroller.py
+git rm selfdrive/car/*/carcontroller.py
 
-  git commit -m "create dashcam release from release2"
+git commit -m "create dashcam release from release2"
-  #git push -f origin release2-staging:dashcam-staging
+git push -f origin release2-staging:dashcam-staging
-  git push -f origin release2-staging:d_staging_test
-fi

selfdrive/test/phone_ci.py

@@ -52,8 +52,6 @@ def run_on_phone(test_cmd):
   conn.send(f"cd {SOURCE_DIR}\n")
   conn.send("git reset --hard\n")
   conn.send("git fetch origin\n")
-  conn.send("find . -maxdepth 1 -not -path './.git' -not -name '.' -not -name '..' -exec rm -rf '{}' \\;\n")
-  conn.send(f"git reset --hard {commit}\n")
   conn.send(f"git checkout {commit}\n")
   conn.send("git clean -xdf\n")
   conn.send("git submodule update --init\n")