From 624ff9c548960e834987e941be7b230496e78d11 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 9 Aug 2023 00:34:08 -0700 Subject: [PATCH] Revert matrix Revert "try this" This reverts commit 8d0d91fd70c467c1fbb4e4e9aed511d15b2a30ef. Revert "how about this" This reverts commit a8e4fc53234824e77cbfb1e471277bc033e9dea1. Revert "matrix can't be in parallel" This reverts commit daaa6fcc3c75c74cbb90e97c565099a94123994c. Revert "fix values" This reverts commit df554b6a3371d124a574eb8d26bc51ef5b5b8fde. Revert "how many levels do we need?" This reverts commit 1a17320fa1c5e7220ef60e29981bbb3bb7da16c6. Revert "fix" This reverts commit e7eb6e404358fbd2eac3fea1901a8d30ea92d729. Revert "add matrix" This reverts commit a1b57e5725417d3c2f639f8edfc0c889b84b6753. --- Jenkinsfile | 326 +++++++++++++++++++++++++--------------------------- 1 file changed, 154 insertions(+), 172 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f67005aa8c..2dc5db3cec 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -100,207 +100,189 @@ pipeline { } } - stage('large test models') { - matrix { - - axes { - axis { - name 'JOB_ID' - values 0, 1, 2, 3, 4 + stage('openpilot tests') { + when { + not { + anyOf { + branch 'master-ci'; branch 'devel'; branch 'devel-staging'; + branch 'release3'; branch 'release3-staging'; branch 'dashcam3'; branch 'dashcam3-staging'; + branch 'testing-closet*'; branch 'hotfix-*' } } + } + + parallel { - stages { - stage('start large test models') { - agent { dockerfile { filename 'Dockerfile.openpilot_base'; args '--user=root' } } - steps { - sh "git config --global --add safe.directory '*'" - sh "git submodule update --init --depth=1 --recursive" - sh "scons -j42" - sh "cd selfdrive/car/tests && PYTHONPATH='${WORKSPACE}' JOB_ID=${JOB_ID} NUM_JOBS=5 INTERNAL_SEG_LIST='selfdrive/car/tests/test_models_segs.txt' ./test_models.py" + /* + stage('simulator') { + agent { + dockerfile { + filename 'Dockerfile.sim_nvidia' + dir 'tools/sim' + args '--user=root' + } + } + steps { + sh "git config --global --add safe.directory '*'" + sh "git submodule update --init --recursive" + sh "git lfs pull" + lock(resource: "", label: "simulator", inversePrecedence: true, quantity: 1) { + sh "${WORKSPACE}/tools/sim/build_container.sh" + sh "DETACH=1 ${WORKSPACE}/tools/sim/start_carla.sh" + sh "${WORKSPACE}/tools/sim/start_openpilot_docker.sh" + } + } + + post { + always { + sh "docker kill carla_sim || true" + sh "rm -rf ${WORKSPACE}/* || true" + sh "rm -rf .* || true" } } } - } + */ - post { - always { - sh "rm -rf ${WORKSPACE}/* || true" - sh "rm -rf .* || true" + stage('large test models') { + agent { dockerfile { filename 'Dockerfile.openpilot_base'; args '--user=root' } } + steps { + sh "git config --global --add safe.directory '*'" + sh "git submodule update --init --depth=1 --recursive" + sh "scons -j42" + sh "cd selfdrive/car/tests && PYTHONPATH='${WORKSPACE}' INTERNAL_SEG_LIST='selfdrive/car/tests/test_models_segs.txt' ./test_models.py" + } + + post { + always { + sh "rm -rf ${WORKSPACE}/* || true" + sh "rm -rf .* || true" + } + } } - } - } -// stage('openpilot tests') { -// when { -// not { -// anyOf { -// branch 'master-ci'; branch 'devel'; branch 'devel-staging'; -// branch 'release3'; branch 'release3-staging'; branch 'dashcam3'; branch 'dashcam3-staging'; -// branch 'testing-closet*'; branch 'hotfix-*' -// } -// } -// } -// -// -// -// parallel { -// -// /* -// stage('simulator') { +// stage('scons build test') { // agent { // dockerfile { -// filename 'Dockerfile.sim_nvidia' -// dir 'tools/sim' +// filename 'Dockerfile.openpilot_base' // args '--user=root' // } // } // steps { // sh "git config --global --add safe.directory '*'" -// sh "git submodule update --init --recursive" -// sh "git lfs pull" -// lock(resource: "", label: "simulator", inversePrecedence: true, quantity: 1) { -// sh "${WORKSPACE}/tools/sim/build_container.sh" -// sh "DETACH=1 ${WORKSPACE}/tools/sim/start_carla.sh" -// sh "${WORKSPACE}/tools/sim/start_openpilot_docker.sh" -// } +// sh "git submodule update --init --depth=1 --recursive" +// sh "scons --clean && scons --no-cache -j42" +// sh "scons --clean && scons --no-cache --random -j42" // } // // post { // always { -// sh "docker kill carla_sim || true" // sh "rm -rf ${WORKSPACE}/* || true" // sh "rm -rf .* || true" // } // } // } -// */ // +// stage('tizi-tests') { +// agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } +// steps { +// phone_steps("tizi", [ +// ["build openpilot", "cd selfdrive/manager && ./build.py"], +// ["test boardd loopback", "SINGLE_PANDA=1 pytest selfdrive/boardd/tests/test_boardd_loopback.py"], +// ["test pandad", "pytest selfdrive/boardd/tests/test_pandad.py"], +// ["test sensord", "cd system/sensord/tests && pytest test_sensord.py"], +// ["test camerad", "pytest system/camerad/test/test_camerad.py"], +// ["test exposure", "pytest system/camerad/test/test_exposure.py"], +// ["test amp", "pytest system/hardware/tici/tests/test_amplifier.py"], +// ["test hw", "pytest system/hardware/tici/tests/test_hardware.py"], +// ["test rawgpsd", "pytest system/sensord/rawgps/test_rawgps.py"], +// ]) +// } +// } // +// stage('build') { +// agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } +// environment { +// R3_PUSH = "${env.BRANCH_NAME == 'master' ? '1' : ' '}" +// } +// steps { +// phone_steps("tici-needs-can", [ +// ["build master-ci", "cd $SOURCE_DIR/release && TARGET_DIR=$TEST_DIR ./build_devel.sh"], +// ["build openpilot", "cd selfdrive/manager && ./build.py"], +// ["check dirty", "release/check-dirty.sh"], +// ["onroad tests", "cd selfdrive/test/ && ./test_onroad.py"], +// ["time to onroad", "cd selfdrive/test/ && pytest test_time_to_onroad.py"], +// ]) +// } +// } // -// // stage('scons build test') { -// // agent { -// // dockerfile { -// // filename 'Dockerfile.openpilot_base' -// // args '--user=root' -// // } -// // } -// // steps { -// // sh "git config --global --add safe.directory '*'" -// // sh "git submodule update --init --depth=1 --recursive" -// // sh "scons --clean && scons --no-cache -j42" -// // sh "scons --clean && scons --no-cache --random -j42" -// // } -// // -// // post { -// // always { -// // sh "rm -rf ${WORKSPACE}/* || true" -// // sh "rm -rf .* || true" -// // } -// // } -// // } -// // -// // stage('tizi-tests') { -// // agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } -// // steps { -// // phone_steps("tizi", [ -// // ["build openpilot", "cd selfdrive/manager && ./build.py"], -// // ["test boardd loopback", "SINGLE_PANDA=1 pytest selfdrive/boardd/tests/test_boardd_loopback.py"], -// // ["test pandad", "pytest selfdrive/boardd/tests/test_pandad.py"], -// // ["test sensord", "cd system/sensord/tests && pytest test_sensord.py"], -// // ["test camerad", "pytest system/camerad/test/test_camerad.py"], -// // ["test exposure", "pytest system/camerad/test/test_exposure.py"], -// // ["test amp", "pytest system/hardware/tici/tests/test_amplifier.py"], -// // ["test hw", "pytest system/hardware/tici/tests/test_hardware.py"], -// // ["test rawgpsd", "pytest system/sensord/rawgps/test_rawgps.py"], -// // ]) -// // } -// // } -// // -// // stage('build') { -// // agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } -// // environment { -// // R3_PUSH = "${env.BRANCH_NAME == 'master' ? '1' : ' '}" -// // } -// // steps { -// // phone_steps("tici-needs-can", [ -// // ["build master-ci", "cd $SOURCE_DIR/release && TARGET_DIR=$TEST_DIR ./build_devel.sh"], -// // ["build openpilot", "cd selfdrive/manager && ./build.py"], -// // ["check dirty", "release/check-dirty.sh"], -// // ["onroad tests", "cd selfdrive/test/ && ./test_onroad.py"], -// // ["time to onroad", "cd selfdrive/test/ && pytest test_time_to_onroad.py"], -// // ]) -// // } -// // } -// // -// // stage('loopback-tests') { -// // agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } -// // steps { -// // phone_steps("tici-loopback", [ -// // ["build openpilot", "cd selfdrive/manager && ./build.py"], -// // ["test boardd loopback", "pytest selfdrive/boardd/tests/test_boardd_loopback.py"], -// // ]) -// // } -// // } -// // -// // stage('HW + Unit Tests') { -// // agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } -// // steps { -// // phone_steps("tici-common", [ -// // ["build", "cd selfdrive/manager && ./build.py"], -// // ["test pandad", "pytest selfdrive/boardd/tests/test_pandad.py"], -// // ["test power draw", "pytest system/hardware/tici/tests/test_power_draw.py"], -// // ["test loggerd", "pytest system/loggerd/tests/test_loggerd.py"], -// // ["test encoder", "LD_LIBRARY_PATH=/usr/local/lib pytest system/loggerd/tests/test_encoder.py"], -// // ["test pigeond", "pytest system/sensord/tests/test_pigeond.py"], -// // ["test manager", "pytest selfdrive/manager/test/test_manager.py"], -// // ["test nav", "pytest selfdrive/navd/tests/"], -// // ]) -// // } -// // } -// // -// // stage('camerad') { -// // agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } -// // steps { -// // phone_steps("tici-ar0231", [ -// // ["build", "cd selfdrive/manager && ./build.py"], -// // ["test camerad", "pytest system/camerad/test/test_camerad.py"], -// // ["test exposure", "pytest system/camerad/test/test_exposure.py"], -// // ]) -// // phone_steps("tici-ox03c10", [ -// // ["build", "cd selfdrive/manager && ./build.py"], -// // ["test camerad", "pytest system/camerad/test/test_camerad.py"], -// // ["test exposure", "pytest system/camerad/test/test_exposure.py"], -// // ]) -// // } -// // } -// // -// // stage('sensord') { -// // agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } -// // steps { -// // phone_steps("tici-lsmc", [ -// // ["build", "cd selfdrive/manager && ./build.py"], -// // ["test sensord", "cd system/sensord/tests && pytest test_sensord.py"], -// // ]) -// // phone_steps("tici-bmx-lsm", [ -// // ["build", "cd selfdrive/manager && ./build.py"], -// // ["test sensord", "cd system/sensord/tests && pytest test_sensord.py"], -// // ]) -// // } -// // } -// // -// // stage('replay') { -// // agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } -// // steps { -// // phone_steps("tici-replay", [ -// // ["build", "cd selfdrive/manager && ./build.py"], -// // ["model replay", "cd selfdrive/test/process_replay && ./model_replay.py"], -// // ]) -// // } -// // } +// stage('loopback-tests') { +// agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } +// steps { +// phone_steps("tici-loopback", [ +// ["build openpilot", "cd selfdrive/manager && ./build.py"], +// ["test boardd loopback", "pytest selfdrive/boardd/tests/test_boardd_loopback.py"], +// ]) +// } +// } // -// } -// } +// stage('HW + Unit Tests') { +// agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } +// steps { +// phone_steps("tici-common", [ +// ["build", "cd selfdrive/manager && ./build.py"], +// ["test pandad", "pytest selfdrive/boardd/tests/test_pandad.py"], +// ["test power draw", "pytest system/hardware/tici/tests/test_power_draw.py"], +// ["test loggerd", "pytest system/loggerd/tests/test_loggerd.py"], +// ["test encoder", "LD_LIBRARY_PATH=/usr/local/lib pytest system/loggerd/tests/test_encoder.py"], +// ["test pigeond", "pytest system/sensord/tests/test_pigeond.py"], +// ["test manager", "pytest selfdrive/manager/test/test_manager.py"], +// ["test nav", "pytest selfdrive/navd/tests/"], +// ]) +// } +// } +// +// stage('camerad') { +// agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } +// steps { +// phone_steps("tici-ar0231", [ +// ["build", "cd selfdrive/manager && ./build.py"], +// ["test camerad", "pytest system/camerad/test/test_camerad.py"], +// ["test exposure", "pytest system/camerad/test/test_exposure.py"], +// ]) +// phone_steps("tici-ox03c10", [ +// ["build", "cd selfdrive/manager && ./build.py"], +// ["test camerad", "pytest system/camerad/test/test_camerad.py"], +// ["test exposure", "pytest system/camerad/test/test_exposure.py"], +// ]) +// } +// } +// +// stage('sensord') { +// agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } +// steps { +// phone_steps("tici-lsmc", [ +// ["build", "cd selfdrive/manager && ./build.py"], +// ["test sensord", "cd system/sensord/tests && pytest test_sensord.py"], +// ]) +// phone_steps("tici-bmx-lsm", [ +// ["build", "cd selfdrive/manager && ./build.py"], +// ["test sensord", "cd system/sensord/tests && pytest test_sensord.py"], +// ]) +// } +// } +// +// stage('replay') { +// agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } +// steps { +// phone_steps("tici-replay", [ +// ["build", "cd selfdrive/manager && ./build.py"], +// ["model replay", "cd selfdrive/test/process_replay && ./model_replay.py"], +// ]) +// } +// } + + } + } } }