build for cvtt-rust

build/build_release.sh

@@ -6,6 +6,7 @@ declare -A git_repo_arr
 git_repo_arr[cvttpy]=git@cloud21.cvtt.vpn:/opt/store/git/cvttpy.git
 git_repo_arr[ops]=git@cloud21.cvtt.vpn:/opt/store/git/ops.git
 git_repo_arr[research]=git@cloud21.cvtt.vpn:/opt/store/git/research.git
+git_repo_arr[cvtt-rust]=git@cloud21.cvtt.vpn:/opt/store/git/cvtt2/cvtt-rust.git
 
 dist_root=/home/cvttdist/software/cvtt2
 dist_user=cvttdist
@@ -48,13 +49,29 @@ while getopts ":p:b:i" opt; do
 done
 # ---------------- cmdline
 
-function confirm {
+confirm() {
     if [ "${interactive}" == "Y" ]; then
         echo "--------------------------------"
         echo -n "Press <Enter> to continue" && read
     fi
 }
 
+rust_binaries() {
+    res=()
+    for binname in $(cargo metadata --no-deps --format-version 1 | jq -r '.packages[].targets[] | select(.kind | index("bin")) | .name'); do
+        res+=("${binname}")
+    done
+    echo "${res[@]}"
+}
+
+rust_libraries() {
+    res=()
+    for libname in $(cargo metadata --no-deps --format-version 1 | jq -r '.packages[].targets[] | select(.kind | index("lib")) | .name'); do
+        res+=("lib${libname}.rlib")
+    done
+    echo "${res[@]}"
+}
+
 if [ "${interactive}" == "Y" ]; then
     echo -n "Enter project [${prj}]: "
     read project
@@ -149,6 +166,29 @@ cmd_arr+=("${Cmd}")
 Cmd="rm -rf .git"
 cmd_arr+=("${Cmd}")
 
+SourceLoc=../${project}
+if [ "${project}" == "cvtt-rust" ]; then
+
+    Cmd="cd ${dist_root}/${project}/"
+    cmd_arr+=("${Cmd}")
+    # cmd_arr+=("cargo build")
+    cmd_arr+=("cargo build --release")
+    cmd_arr+=("mkdir -p ./dist/release")
+    pushd ${dist_root}/${project}/
+    rust_bins=$(rust_binaries)
+    rust_libs=$(rust_libraries)
+    popd
+    for bin in ${rust_bins[@]}; do
+        cmd_arr+=("cp target/release/${bin} ./dist/release")
+    done
+    for lb in ${rust_libs[@]}; do
+        cmd_arr+=("cp target/release/${lb} ./dist/release")
+    done
+    cmd_arr+=("cp release_version.txt ./dist/release")
+
+    SourceLoc=../${project}/dist/release
+fi
+
 dist_path="${dist_root}/${project}/${release_version}"
 
 for dist_loc in ${dist_locations}; do
@@ -156,9 +196,9 @@ for dist_loc in ${dist_locations}; do
     dist_host=${dhp[0]}
     dist_port=${dhp[1]}
     Cmd="rsync -avzh"
-    Cmd="${Cmd} --rsync-path=\"mkdir -p ${dist_path} && rsync\""
-    Cmd="${Cmd} -e \"ssh -p ${dist_ssh_port}\""
-    Cmd="${Cmd} ../${project} ${dist_user}@${dist_host}:${dist_path}/"
+    Cmd="${Cmd} --rsync-path=\"mkdir -p ${dist_path}"
+    Cmd="${Cmd} && rsync\" -e \"ssh -p ${dist_ssh_port}\""
+    Cmd="${Cmd} $SourceLoc ${dist_user}@${dist_host}:${dist_path}/"
     cmd_arr+=("${Cmd}")
 done
 
@@ -179,8 +219,4 @@ do
     pwd && echo ${cmd} && eval ${cmd}
 done
 
-echo "PROJECT ${project} **** P U L L   N E W   T A G S  F R O M  o r i g i n ****"
-echo "----"
-echo "(cd ${project}; git pull --tags; git pushall)"
-echo "----"
 echo "$0 Done ${project} ${release_version}"

release_version.txt

@@ -1 +1 @@
-1.7.7,services avalability check
+1.7.9,build for cvtt-rust

scripts/healthcheck/hosts_check.sh

@@ -55,11 +55,9 @@ done
 for Host in ${Hosts[@]} ; do
     host=$(echo $Host | cut -d'.' -f1)
     Domain=$(echo $Host | cut -d'.' -f2-)
-    # echo "Host=$Host host=$host Domain=$Domain"
 
-    # Get SSH port for the host, or use default if not specified
     ToCheck=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].to_check // "Yes"')
-    if [ "${ToCheck}" == "No" ]; then
+    if [ "${ToCheck^^}" == "NO" ]; then
         continue
     fi
     PortSSH=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].ssh_port // '"$DEFAULT_SSH_PORT"'')

scripts/healthcheck/services_check.sh

@@ -39,9 +39,8 @@ mapfile -t SvcNames < <(echo ${SERVICES_CONFIG} | jq -r '. | keys[]')
 
 DEFAULT_TO_CHECK=Yes
 for SvcName in "${SvcNames[@]}" ; do
-    echo "SvcName=$SvcName"
     ToCheck=$(echo "$SERVICES_CONFIG" | jq -r --arg svcname "$SvcName" '.[$svcname].to_check // "Yes"')
-    if [ "${ToCheck}" == "No" ]; then
+    if [ "${ToCheck^^}" == "NO" ]; then
         continue
     fi
     Host=$(echo "$SERVICES_CONFIG" | jq -r --arg svcname "$SvcName"  '.[$svcname].host ')