diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 26b28ab330..a5a91a482b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -34,3 +34,7 @@ jobs: - run: ./tools/op.sh setup - name: Push master-ci run: BRANCH=__nightly tools/release/build_stripped.sh + - name: Push chestnut nightly + run: | + git lfs pull --exclude='' + INCLUDE_BIG_MODEL=1 BRANCH=__nightly-chestnut tools/release/build_stripped.sh diff --git a/Jenkinsfile b/Jenkinsfile index 0f4945dab6..d46d599457 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -169,7 +169,7 @@ node { env.GIT_BRANCH = checkout(scm).GIT_BRANCH env.GIT_COMMIT = checkout(scm).GIT_COMMIT - def excludeBranches = ['__nightly', 'devel', 'devel-staging', + def excludeBranches = ['__nightly', '__nightly-chestnut', 'devel', 'devel-staging', 'release-tizi', 'release-tizi-staging', 'release-mici', 'release-mici-staging', 'testing-closet*', 'hotfix-*'] def excludeRegex = excludeBranches.join('|').replaceAll('\\*', '.*') @@ -201,6 +201,12 @@ node { ) } + if (env.BRANCH_NAME == '__nightly-chestnut') { + deviceStage("build nightly-chestnut", "mici-chestnut-ci", [], [ + step("build nightly-chestnut", "SCONSFLAGS=-j4 INCLUDE_BIG_MODEL=1 RELEASE_BRANCH=nightly-chestnut $SOURCE_DIR/tools/release/build_release.sh TestChestnutOnroad"), + ]) + } + if (!env.BRANCH_NAME.matches(excludeRegex)) { parallel ( 'onroad tests': { diff --git a/openpilot/system/hardware/chestnut/status.py b/openpilot/system/hardware/chestnut/status.py index c3321a3971..8c38987dff 100644 --- a/openpilot/system/hardware/chestnut/status.py +++ b/openpilot/system/hardware/chestnut/status.py @@ -4,7 +4,7 @@ from openpilot.common.hardware.usb import CHESTNUT_USB_PRODUCT, is_chestnut_usb_ from openpilot.selfdrive.modeld.helpers import chestnut_compiled -CHESTNUT_RELEASE_BRANCHES = ("release-chestnut", "release-chestnut-staging") +CHESTNUT_RELEASE_BRANCHES = ("release-chestnut", "release-chestnut-staging", "nightly-chestnut") CHESTNUT_POWERED_VOLTAGE = 5000 GPU_TEMP_LIMIT = 100. MEMORY_TEMP_LIMIT = 95. diff --git a/tools/release/build_release.sh b/tools/release/build_release.sh index 4bc5dd2e68..cced9f7a54 100755 --- a/tools/release/build_release.sh +++ b/tools/release/build_release.sh @@ -89,7 +89,7 @@ git -c core.compression=0 -c gc.auto=0 commit -m "openpilot v$VERSION" # Run tests cd $BUILD_DIR -RELEASE=1 ./openpilot/selfdrive/test/test_onroad.py +RELEASE=1 ./openpilot/selfdrive/test/test_onroad.py "$@" #tools/test_runner.py openpilot/selfdrive/car/tests/test_car_interfaces.py echo "[-] pushing release T=$SECONDS" diff --git a/tools/release/build_stripped.sh b/tools/release/build_stripped.sh index ba4c847375..a216dfe11c 100755 --- a/tools/release/build_stripped.sh +++ b/tools/release/build_stripped.sh @@ -78,6 +78,9 @@ fi if [ ! -z "$BRANCH" ]; then echo "[-] Pushing to $BRANCH T=$SECONDS" + # Reset hooks since releases exclude .venv + git config --local core.hooksPath .git/hooks + git lfs update --force # uploading the larger pack is faster than spending CPU to optimize it git -c pack.window=0 -c pack.depth=0 -c pack.compression=0 push -f origin tmp:$BRANCH fi