slightly better names

Jenkinsfile

@@ -151,8 +151,8 @@ def build_channel(String channel_name) {
     },
     "${channel_name} (casync)": {
       deviceStage("build casync", "tici-needs-can", [], [
-        ["build ${channel_name}", "BUILD_DIR=/data/openpilot_build OUTPUT_DIR=/data/casync RELEASE_CHANNEL=${channel_name} $SOURCE_DIR/release/build_casync_channel.sh"],
-        //["upload ${channel_name}", "RELEASE_CHANNEL=${channel_name} $SOURCE_DIR/release/upload_casync_channel.sh"],
+        ["build ${channel_name}", "BUILD_DIR=/data/openpilot_build OUTPUT_DIR=/data/casync OPENPILOT_CHANNEL=${channel_name} $SOURCE_DIR/release/build_casync_channel.sh"],
+        //["upload ${channel_name}", "OPENPILOT_CHANNEL=${channel_name} $SOURCE_DIR/release/upload_casync_channel.sh"],
       ])
     }
   )

release/README.md

@@ -3,9 +3,9 @@
 
 ## terms
 
-`channel` - a named version of openpilot (git branches or casync caidx)<br>
+`channel` - a named version of openpilot with only required files for running openpilot and identifying the channel<br>
 `prebuilt` - a channel prebuilt for the tici, no building required on device<br>
-`release` - a channel that is prebuilt and also has `ALLOW_DEBUG` false. (`nightly`, `release3`)<br>
+`release` - prebuilt with `ALLOW_DEBUG` false (RELEASE=1 when building panda). (`nightly`, `release3`)<br>
 
 ## creating casync channel
 
@@ -17,7 +17,7 @@
 # and other casync files into CASYNC_DIR for uploading to openpilot-channels
 BUILD_DIR=/data/openpilot_build    \
 CASYNC_DIR=/data/casync            \
-RELEASE_CHANNEL=nightly            \
+OPENPILOT_CHANNEL=nightly            \
 release/build_casync_channel.sh
 ```
 

release/build_casync_channel.sh

@@ -14,8 +14,8 @@ mkdir -p $CASYNC_DIR
 rm -rf $BUILD_DIR
 mkdir -p $BUILD_DIR
 
-release/copy_release_files.sh $SOURCE_DIR $BUILD_DIR
+release/copy_channel_files.sh $SOURCE_DIR $BUILD_DIR
 release/create_prebuilt.sh $BUILD_DIR
 
 cd $SOURCE_DIR
-release/create_casync_channel.py $BUILD_DIR $CASYNC_DIR $RELEASE_CHANNEL
+release/create_casync_channel.py $BUILD_DIR $CASYNC_DIR $OPENPILOT_CHANNEL

release/build_git_channel.sh

@@ -23,7 +23,7 @@ git checkout --orphan $RELEASE_BRANCH
 # do the files copy
 echo "[-] copying files T=$SECONDS"
 cd $SOURCE_DIR
-release/copy_release_files.sh $SOURCE_DIR $BUILD_DIR
+release/copy_channel_Files.sh $SOURCE_DIR $BUILD_DIR
 
 cd $BUILD_DIR
 VERSION=$(cat common/version.h | awk -F[\"-]  '{print $2}')

release/create_prebuilt.sh

@@ -6,17 +6,17 @@ set -ex
 
 BUILD_DIR=$1
 
-rm -f panda/board/obj/panda.bin.signed
-rm -f panda/board/obj/panda_h7.bin.signed
-
 cd $BUILD_DIR
 
 # Build
 export PYTHONPATH="$BUILD_DIR"
 scons -j$(nproc)
 
-# release panda fw
-CERT=/data/pandaextra/certs/release RELEASE=1 scons -j$(nproc) panda/
+if [ -n "$RELEASE" ]; then
+  rm -f panda/board/obj/panda.bin.signed
+  rm -f panda/board/obj/panda_h7.bin.signed
+  CERT=/data/pandaextra/certs/release scons -j$(nproc) panda/
+fi
 
 # Cleanup
 find . -name '*.a' -delete