From baec214e453bea0f2615c12b30c5b9055a11edf6 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Wed, 28 Jul 2021 22:19:30 -0700
Subject: [PATCH] build release3 in CI (#21772)

* ci pushes this now

* fix path

* cd

* push
old-commit-hash: 9ad935644b5116dd0d9821cc47abcaf19de393d7
---
 Jenkinsfile               | 25 ++++++++++++++++++++++---
 release/build_release3.sh |  2 ++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9544a4f7e..20bfcccf6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -71,7 +71,24 @@ pipeline {
       }
       steps {
         phone_steps("eon-build", [
-          ["build release2-staging and dashcam-staging", "cd release && PUSH=1 ./build_release2.sh"],
+          ["build release2-staging & dashcam-staging", "cd release && PUSH=1 ./build_release2.sh"],
+        ])
+      }
+    }
+
+    stage('Build release3') {
+      agent {
+        docker {
+          image 'python:3.7.3'
+          args '--user=root'
+        }
+      }
+      when {
+        branch 'devel-staging'
+      }
+      steps {
+        phone_steps("tici", [
+          ["build release3-staging & dashcam3-staging", "PUSH=1 $SOURCE_DIR/release/build_release3.sh"],
         ])
       }
     }
@@ -80,7 +97,10 @@ pipeline {
       when {
         not {
           anyOf {
-            branch 'master-ci'; branch 'devel'; branch 'devel-staging'; branch 'release2'; branch 'release2-staging'; branch 'dashcam'; branch 'dashcam-staging'; branch 'testing-closet*'; branch 'hotfix-*'
+            branch 'master-ci'; branch 'devel'; branch 'devel-staging';
+            branch 'release2'; branch 'release2-staging'; branch 'dashcam'; branch 'dashcam-staging';
+            branch 'release3'; branch 'release3-staging'; branch 'dashcam3'; branch 'dashcam3-staging';
+            branch 'testing-closet*'; branch 'hotfix-*'
           }
         }
       }
@@ -191,7 +211,6 @@ pipeline {
                     phone_steps("tici", [
                       ["build", "cd selfdrive/manager && ./build.py"],
                       ["onroad tests", "cd selfdrive/test/ && ./test_onroad.py"],
-                      //["build release3-staging", "cd release && PUSH=${env.R3_PUSH} ./build_release3.sh"],
                     ])
                   }
                 }
diff --git a/release/build_release3.sh b/release/build_release3.sh
index 5664d984f..7a5f8dc2b 100755
--- a/release/build_release3.sh
+++ b/release/build_release3.sh
@@ -4,6 +4,8 @@
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 
+cd $DIR
+
 BUILD_DIR=/data/openpilot
 SOURCE_DIR="$(git rev-parse --show-toplevel)"