Merge pull request #14006 from richardkchapman/incr-upmerges

HPCC-24480 Do not upmerge release branches to .x ones

Reviewed-by: Jake Smith
Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>

cmake_modules/go_gold.sh

@@ -100,8 +100,3 @@ if [ -e helm/hpcc/Chart.yaml ] ; then
   doit "git push $REMOTE master $FORCE"
   popd
 fi
-
-# upmerge back to minor closedown branch to ensure incr.sh works
-doit "git checkout candidate-$HPCC_MAJOR.$NEW_MINOR.x"
-doit "git merge --no-ff --no-commit -X ours candidate-$HPCC_MAJOR.$NEW_MINOR.$NEW_POINT"
-doit "if ! git diff HEAD --exit-code ; then git merge --abort ; else git commit -s && git push origin candidate-$HPCC_MAJOR.$NEW_MINOR.x ; fi" 

cmake_modules/go_rc.sh

@@ -106,8 +106,3 @@ if [ -e helm/hpcc/Chart.yaml ] ; then
   doit "git push $REMOTE master $FORCE"
   popd
 fi
-
-# upmerge back to minor closedown branch to ensure incr.sh works
-doit "git checkout candidate-$HPCC_MAJOR.$NEW_MINOR.x"
-doit "git merge --no-ff --no-commit -X ours candidate-$HPCC_MAJOR.$NEW_MINOR.$NEW_POINT"
-doit "if ! git diff HEAD --exit-code ; then git merge --abort ; else git commit -s && git push origin candidate-$HPCC_MAJOR.$NEW_MINOR.x ; fi" 

dockerfiles/buildall.sh

@@ -62,6 +62,7 @@ pushd $DIR 2>&1 > /dev/null
 
 . ../cmake_modules/parse_cmake.sh
 parse_cmake
+set_tag
 
 if [[ "$HPCC_MATURITY" = "release" ]] && [[ "$INPUT_LATEST" = "1" ]] ; then
   LATEST=1
@@ -70,7 +71,7 @@ fi
 build_image() {
   local name=$1
   local label=$2
-  [[ -z ${label} ]] && label=$BUILD_LABEL
+  [[ -z ${label} ]] && label=$HPCC_SHORT_TAG
 
   if ! docker pull hpccsystems/${name}:${label} ; then
     docker image build -t hpccsystems/${name}:${label} \

dockerfiles/cleanup.sh

@@ -22,8 +22,13 @@
 [[ "$1" == "-all" ]] && docker rm $(docker ps -q -f 'status=exited')
 docker rmi $(docker images -q -f "dangling=true")
 
-HEAD=$(git rev-parse --short HEAD)
-PREV=$(git describe --abbrev=0 --tags)
+if [[ "$1" == "-all" ]] ; then
+  HEAD=NOSUCHTHING
+  PREV=NOSUCHTHING
+else
+  HEAD=$(git rev-parse --short HEAD)
+  PREV=$(git describe --abbrev=0 --tags)
+fi
 for f in `docker images  --format "{{.Repository}}:{{.Tag}}" | grep hpccsystems/ | grep -v $HEAD | grep -v $PREV` ; do
   docker rmi $f
 done

dockerfiles/incr.sh

@@ -77,9 +77,9 @@ if [[ -z "$FORCE" ]] ; then
 
   # If not found above, look for latest tagged
   if [[ -z ${PREV} ]] ; then
-    PREV=$(git describe --abbrev=0 --tags)
+    PREV=$(git log --oneline --no-merges | grep "^[0-9a-f]* Split off " | head -1 | sed "s/.*Split off //" | head -1)-rc1
     if [[ ! "${BUILD_TYPE}" =~ "Release" ]] ; then
-      PREVE=${PREV}-${BUILD_TYPE}
+      PREV=${PREV}-${BUILD_TYPE}
     fi
     echo Finding image based on most recent git tag: ${PREV}
     INCR_DOCKER_REPO=hpccsystems

dockerfiles/platform-build-incremental/Dockerfile

@@ -54,6 +54,5 @@ RUN echo Building with $(cat ~/build_threads) threads
 RUN make -j$(cat ~/build_threads)
 
 USER root
-RUN cmake /hpcc-dev/HPCC-Platform -DUSE_PYTHON2=0
 RUN make -j$(cat ~hpcc/build_threads) install