JBR-4370 create a test checking presence of all JBR artifacts - fix permissions

jb/project/tools/linux/scripts/mkimages_x64.sh

@@ -94,7 +94,7 @@ function create_jbr {
   rm -rf ${BASE_DIR}/${JBR_BUNDLE}
 }
 
-JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
+JBRSDK_BASE_NAME=jbrsdk_${bundle_type}-${JBSDK_VERSION}
 WITH_DEBUG_LEVEL="--with-debug-level=release"
 RELEASE_NAME=linux-x86_64-normal-server-release
 JBSDK=${JBRSDK_BASE_NAME}-linux-x64-b${build_number}
@@ -137,7 +137,11 @@ echo Fixing permissions
 chmod -R a+r $JSDK
 
 BASE_DIR=build/${RELEASE_NAME}/images
-JBRSDK_BUNDLE=jbrsdk
+if [ "${bundle_type}" == "dcevm" ] || [ "${bundle_type}" == "jcef" ]; then
+  JBRSDK_BUNDLE=jbrsdk_${bundle_type}
+else
+  JBRSDK_BUNDLE=jbrsdk
+fi
 
 rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE}
 cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || do_exit $?
@@ -145,7 +149,7 @@ cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || do_exit $?
 if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]] || [[ "${bundle_type}" == fd ]]; then
   rsync -av ${JCEF_PATH}/ $BASE_DIR/$JBRSDK_BUNDLE/lib --exclude="modular-sdk" || do_exit $?
 fi
-if [ "${bundle_type}" == "dcevm" ] || [ "${bundle_type}" == "fd" ]; then
+if [ "${bundle_type}" == "dcevm" ] || [ "${bundle_type}" == "jcef" ] || [ "${bundle_type}" == "fd" ]; then
   echo Creating $JBSDK.tar.gz ...
   sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/release > release
   mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/release

jb/project/tools/mac/scripts/mkimages.sh

@@ -141,7 +141,7 @@ function create_jbr {
   rm -rf ${BASE_DIR}/${JBR_BUNDLE}
 }
 
-JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
+JBRSDK_BASE_NAME=jbrsdk_${bundle_type}-${JBSDK_VERSION}
 WITH_DEBUG_LEVEL="--with-debug-level=release"
 CONF_ARCHITECTURE=x86_64
 if [[ "${architecture}" == *aarch64* ]]; then
@@ -149,7 +149,7 @@ if [[ "${architecture}" == *aarch64* ]]; then
 fi
 CONF_NAME=macosx-${CONF_ARCHITECTURE}-normal-server-release
 
-JBSDK=${JBRSDK_BASE_NAME}-osx-${architecture}-b${build_number}
+JBSDK="${JBRSDK_BASE_NAME}-osx-${architecture}-b${build_number}"
 case "$bundle_type" in
   "jcef")
     git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
@@ -186,7 +186,11 @@ make images CONF=$CONF_NAME || do_exit $?
 JSDK=build/${CONF_NAME}/images/jdk-bundle
 
 BASE_DIR=jre
-JBRSDK_BUNDLE=jbrsdk
+if [ "${bundle_type}" == "dcevm" ] || [ "${bundle_type}" == "jcef" ]; then
+  JBRSDK_BUNDLE=jbrsdk_${bundle_type}
+else
+  JBRSDK_BUNDLE=jbrsdk
+fi
 
 rm -rf $BASE_DIR
 mkdir $BASE_DIR || do_exit $?
@@ -194,7 +198,7 @@ cp -a $JSDK/jdk-$JBSDK_VERSION_WITH_DOTS.jdk $BASE_DIR/$JBRSDK_BUNDLE || do_exit
 if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]] || [[ "${bundle_type}" == fd ]]; then
   cp -a ${JCEF_PATH}/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
 fi
-if [ "${bundle_type}" == "dcevm" ] || [ "${bundle_type}" == "fd" ]; then
+if [ "${bundle_type}" == "dcevm" ] || [ "${bundle_type}" == "jcef" ] || [ "${bundle_type}" == "fd" ]; then
   echo Creating $JBSDK.tar.gz ...
   sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release > release
   mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release

jb/project/tools/windows/scripts/mkimages_x64.sh

@@ -91,7 +91,7 @@ function create_jbr {
   cat ${JSDK}/release | tr -d '\r' | grep -v 'JAVA_VERSION' | grep -v 'MODULES' >> ${JBR_BUNDLE}/release
 }
 
-JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
+JBRSDK_BASE_NAME=jbrsdk_${bundle_type}-${JBSDK_VERSION}
 WITH_DEBUG_LEVEL="--with-debug-level=release"
 RELEASE_NAME=windows-x86_64-normal-server-release
 JBSDK=${JBRSDK_BASE_NAME}-windows-x64-b${build_number}
@@ -140,7 +140,13 @@ fi
 
 JSDK=build/$RELEASE_NAME/images/jdk
 BASE_DIR=build/$RELEASE_NAME/images
-JBRSDK_BUNDLE=jbrsdk
+BASE_DIR=jre
+if [ "${bundle_type}" == "dcevm" ] || [ "${bundle_type}" == "jcef" ]; then
+  JBRSDK_BUNDLE=jbrsdk_${bundle_type}
+else
+  JBRSDK_BUNDLE=jbrsdk
+fi
+
 
 rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE} && rsync -a --exclude demo --exclude sample ${JSDK}/ ${JBRSDK_BUNDLE} || do_exit $?
 if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]] || [[ "${bundle_type}" == fd ]]

jb/project/tools/windows/scripts/pack_x64.sh

@@ -51,7 +51,7 @@ function pack_jbr {
   /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR jbr || do_exit $?
 }
 
-JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
+JBRSDK_BASE_NAME=jbrsdk_${bundle_type}-${JBSDK_VERSION}
 WITH_DEBUG_LEVEL="--with-debug-level=release"
 RELEASE_NAME=windows-x86_64-normal-server-release
 JBSDK=${JBRSDK_BASE_NAME}-windows-x64-b${build_number}
@@ -66,9 +66,13 @@ esac
 IMAGES_DIR=build/$RELEASE_NAME/images
 JSDK=$IMAGES_DIR/jdk
 BASE_DIR=.
-
-if [ "${bundle_type}" == "dcevm" ] || [ "${bundle_type}" == "fd" ]; then
+if [ "${bundle_type}" == "dcevm" ] || [ "${bundle_type}" == "jcef" ]; then
+  JBRSDK_BUNDLE=jbrsdk_${bundle_type}
+else
   JBRSDK_BUNDLE=jbrsdk
+fi
+
+if [ "${bundle_type}" == "dcevm" ] || [ "${bundle_type}" == "jcef" ] || [ "${bundle_type}" == "fd" ]; then
   echo Creating $JBSDK.tar.gz ...
   [ -f "$JBSDK.tar.gz" ] && rm "$JBSDK.tar.gz"
   /usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || do_exit $?

test/jdk/jb/build/check_for_artifacts.sh

@@ -0,0 +1,89 @@
+#!/bin/bash
+
+#
+# Copyright 2000-2022 JetBrains s.r.o.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+dirname=$1
+jbsdk_version=$2
+build_number=$3
+
+
+read -r -d '' allArtifacts << EndOFArtifactsList
+jbr-${jbsdk_version}-linux-aarch64-b${build_number}.tar.gz
+jbr-${jbsdk_version}-linux-x86-b${build_number}.tar.gz
+jbr-${jbsdk_version}-windows-x86-b${build_number}.tar.gz
+jbr_dcevm-${jbsdk_version}-linux-x64-b${build_number}.tar.gz
+jbr_dcevm-${jbsdk_version}-osx-aarch64-b${build_number}.tar.gz
+jbr_dcevm-${jbsdk_version}-osx-x64-b${build_number}.tar.gz
+jbr_dcevm-${jbsdk_version}-windows-x64-b${build_number}.tar.gz
+jbr_fd-${jbsdk_version}-linux-x64-b${build_number}.tar.gz
+jbr_fd-${jbsdk_version}-osx-aarch64-b${build_number}.tar.gz
+jbr_fd-${jbsdk_version}-osx-x64-b${build_number}.tar.gz
+jbr_fd-${jbsdk_version}-windows-x64-b${build_number}.tar.gz
+jbr_jcef-${jbsdk_version}-linux-x64-b${build_number}.tar.gz
+jbr_jcef-${jbsdk_version}-osx-aarch64-b${build_number}.tar.gz
+jbr_jcef-${jbsdk_version}-osx-x64-b${build_number}.tar.gz
+jbr_jcef-${jbsdk_version}-windows-x64-b${build_number}.tar.gz
+jbr_nomod-${jbsdk_version}-linux-x64-b${build_number}.tar.gz
+jbr_nomod-${jbsdk_version}-osx-aarch64-b${build_number}.tar.gz
+jbr_nomod-${jbsdk_version}-osx-x64-b${build_number}.tar.gz
+jbr_nomod-${jbsdk_version}-windows-x64-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-linux-aarch64-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-linux-test-aarch64-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-linux-test-x64-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-linux-test-x86-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-linux-x64-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-linux-x64-fastdebug-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-linux-x86-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-osx-aarch64-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-osx-aarch64-fastdebug-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-osx-test-aarch64-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-osx-test-x64-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-osx-x64-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-osx-x64-fastdebug-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-windows-test-x64-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-windows-test-x86-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-windows-x64-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-windows-x64-fastdebug-b${build_number}.tar.gz
+jbrsdk-${jbsdk_version}-windows-x86-b${build_number}.tar.gz
+EndOFArtifactsList
+
+testname="JBRArtifacts"
+count=$(echo $allArtifacts | wc -w)
+n=0
+echo "\#\#teamcity[testStarted name=\'$testname\']"
+for relpath in $dirname/*; do
+  filename=$(basename $relpath)
+  isFound=$(echo $allArtifacts | grep -c $filename)
+  if [ $isFound -gt 0 ]; then
+    echo "$filename found"
+  else
+    n=$((n+1))
+    echo "$filename cannot be found"
+  fi
+done
+if [ $n -eq 0 ]; then
+  echo "\#\#teamcity[testFinished name=\'$testname\']"
+else
+  echo "\#\#teamcity[testFailed name=\'$testname\' message=\'Some artifacts cannot be found\']"
+fi