diff --git a/Jenkinsfile b/Jenkinsfile index f0e6b3dcf5..a7f46ce17a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -166,8 +166,8 @@ node { env.GIT_BRANCH = checkout(scm).GIT_BRANCH env.GIT_COMMIT = checkout(scm).GIT_COMMIT - def excludeBranches = ['__nightly', 'devel', 'devel-staging', 'release3', 'release3-staging', - 'release-tici', 'release-tizi', 'release-tizi-staging', 'release-mici-staging', 'testing-closet*', 'hotfix-*'] + def excludeBranches = ['__nightly', 'devel', 'devel-staging', + 'release-tizi', 'release-tizi-staging', 'release-mici', 'release-mici-staging', 'testing-closet*', 'hotfix-*'] def excludeRegex = excludeBranches.join('|').replaceAll('\\*', '.*') if (env.BRANCH_NAME != 'master' && !env.BRANCH_NAME.contains('__jenkins_loop_')) { @@ -179,7 +179,7 @@ node { try { if (env.BRANCH_NAME == 'devel-staging') { deviceStage("build release-tizi-staging", "tizi-needs-can", [], [ - step("build release-tizi-staging", "RELEASE_BRANCH=release-tizi-staging $SOURCE_DIR/release/build_release.sh && git push -f origin release-tizi-staging:release-mici-staging"), + step("build release-tizi-staging", "RELEASE_BRANCH=release-tizi-staging,release-mici-staging $SOURCE_DIR/release/build_release.sh"), ]) } diff --git a/release/build_release.sh b/release/build_release.sh index d137edab91..5bc73167b0 100755 --- a/release/build_release.sh +++ b/release/build_release.sh @@ -16,6 +16,8 @@ if [ -z "$RELEASE_BRANCH" ]; then exit 1 fi +BUILD_BRANCH=release-build + # set git identity source $DIR/identity.sh @@ -26,7 +28,7 @@ mkdir -p $BUILD_DIR cd $BUILD_DIR git init git remote add origin git@github.com:commaai/openpilot.git -git checkout --orphan $RELEASE_BRANCH +git checkout --orphan $BUILD_BRANCH # do the files copy echo "[-] copying files T=$SECONDS" @@ -86,9 +88,11 @@ cd $BUILD_DIR RELEASE=1 pytest -n0 -s selfdrive/test/test_onroad.py #pytest selfdrive/car/tests/test_car_interfaces.py -if [ ! -z "$RELEASE_BRANCH" ]; then - echo "[-] pushing release T=$SECONDS" - git push -f origin $RELEASE_BRANCH:$RELEASE_BRANCH -fi +echo "[-] pushing release T=$SECONDS" +REFS=() +for branch in ${RELEASE_BRANCH//,/ }; do + REFS+=("$BUILD_BRANCH:$branch") +done +git push -f origin "${REFS[@]}" echo "[-] done T=$SECONDS"