diff --git a/Jenkinsfile b/Jenkinsfile index d12c8e4946..1887205a43 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,32 +57,6 @@ pipeline { } stages { - stage('build releases') { - when { - branch 'devel-staging' - } - - parallel { - stage('release2') { - agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } - steps { - phone_steps("eon-build", [ - ["build release2-staging & dashcam-staging", "PUSH=1 $SOURCE_DIR/release/build_release.sh"], - ]) - } - } - - stage('release3') { - agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } - steps { - phone_steps("tici", [ - ["build release3-staging & dashcam3-staging", "PUSH=1 $SOURCE_DIR/release/build_release.sh"], - ]) - } - } - } - } - stage('openpilot tests') { when { not { @@ -136,54 +110,7 @@ pipeline { } } - /* - stage('Power Consumption Tests') { - steps { - lock(resource: "", label: "c2-zookeeper", inversePrecedence: true, variable: 'device_ip', quantity: 1) { - timeout(time: 90, unit: 'MINUTES') { - sh script: "/home/batman/tools/zookeeper/enable_and_wait.py $device_ip 120", label: "turn on device" - phone(device_ip, "git checkout", readFile("selfdrive/test/setup_device_ci.sh"),) - phone(device_ip, "build", "scons -j4 && sync") - sh script: "/home/batman/tools/zookeeper/disable.py $device_ip", label: "turn off device" - sh script: "/home/batman/tools/zookeeper/enable_and_wait.py $device_ip 120", label: "turn on device" - sh script: "/home/batman/tools/zookeeper/check_consumption.py 60 3", label: "idle power consumption after boot" - sh script: "/home/batman/tools/zookeeper/ignition.py 1", label: "go onroad" - sh script: "/home/batman/tools/zookeeper/check_consumption.py 60 10", label: "onroad power consumption" - sh script: "/home/batman/tools/zookeeper/ignition.py 0", label: "go offroad" - sh script: "/home/batman/tools/zookeeper/check_consumption.py 60 2", label: "idle power consumption offroad" - } - } - } - } - */ - - stage('C3: build') { - environment { - R3_PUSH = "${env.BRANCH_NAME == 'master' ? '1' : ' '}" - } - steps { - phone_steps("tici", [ - ["build master-ci", "cd $SOURCE_DIR/release && EXTRA_FILES='tools/' ./build_devel.sh"], - ["build openpilot", "cd selfdrive/manager && ./build.py"], - ["test manager", "python selfdrive/manager/test/test_manager.py"], - ["onroad tests", "cd selfdrive/test/ && ./test_onroad.py"], - ["test car interfaces", "cd selfdrive/car/tests/ && ./test_car_interfaces.py"], - ]) - } - } - - stage('C3: HW + Unit Tests') { - steps { - phone_steps("tici2", [ - ["build", "cd selfdrive/manager && ./build.py"], - ["test boardd loopback", "python selfdrive/boardd/tests/test_boardd_loopback.py"], - ["test loggerd", "python selfdrive/loggerd/tests/test_loggerd.py"], - ["test encoder", "LD_LIBRARY_PATH=/usr/local/lib python selfdrive/loggerd/tests/test_encoder.py"], - ]) - } - } - - stage('C2: camerad') { + stage('C2: camerad') { steps { phone_steps("eon-party", [ ["build", "cd selfdrive/manager && ./build.py"], @@ -193,35 +120,16 @@ pipeline { } } - stage('C3: camerad') { - steps { - phone_steps("tici-party", [ - ["build", "cd selfdrive/manager && ./build.py"], - ["test camerad", "python selfdrive/camerad/test/test_camerad.py"], - ["test exposure", "python selfdrive/camerad/test/test_exposure.py"], - ]) - } - } - - stage('C3: replay') { - steps { - phone_steps("tici-party", [ - ["build", "cd selfdrive/manager && ./build.py"], - ["model replay", "cd selfdrive/test/process_replay && ./model_replay.py"], - ]) - } - } - } } - stage('Push master-ci') { + stage('Push release2-staging') { when { - branch 'master' + branch 'commatwo_master' } steps { phone_steps("eon-build", [ - ["push devel", "cd $SOURCE_DIR/release && PUSH='master-ci' ./build_devel.sh"], + ["build release2-staging", "PUSH=1 $SOURCE_DIR/release/build_release.sh"], ]) } }