Merge pull request #753 from intershop/release/develop/icm

Release icm:patch icm-replication:patch
intershop · Jul 17, 2024 · 7bf3ea6 · 7bf3ea6
2 parents 78b2238 + ea617e5
commit 7bf3ea6
Show file tree

Hide file tree

Showing 10 changed files with 106 additions and 16 deletions.
diff --git a/charts/icm-replication/.bumpversion.toml b/charts/icm-replication/.bumpversion.toml
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.2.0"
+current_version = "2.2.1"
 
 [[tool.bumpversion.files]]
 filename = "Chart.yaml"

diff --git a/charts/icm-replication/CHANGELOG.md b/charts/icm-replication/CHANGELOG.md
@@ -1,11 +1,38 @@
 
+<a name="icm-replication-2.2.1"></a>
+## [icm-replication-2.2.1](https://github.com/intershop/helm-charts/compare/icm-replication-2.2.0...icm-replication-2.2.1)
+
+> 2024-07-17
+
+### Chore
+
+* bump versions of icm:patch icm-replication:patch
+
+### Fix
+
+* **icm:** use logger instead of tee ([#716](https://github.com/intershop/helm-charts/issues/716))
+
+
+<a name="icm-replication-2.2.0"></a>
+## [icm-replication-2.2.0](https://github.com/intershop/helm-charts/compare/icm-replication-2.1.5...icm-replication-2.2.0)
+
+> 2024-07-09
+
+### Chore
+
+* bump versions of icm-web:minor
+* generated changelog+release notes for icm:patch icm-replication:patch
+* bump versions of icm:patch icm-replication:patch
+
+
 <a name="icm-replication-2.1.5"></a>
 ## [icm-replication-2.1.5](https://github.com/intershop/helm-charts/compare/icm-replication-2.1.4...icm-replication-2.1.5)
 
 > 2024-07-08
 
 ### Chore
 
+* generated changelog+release notes for icm:patch icm-replication:patch
 * bump versions of icm:patch icm-replication:patch
 
 ### Fix

diff --git a/charts/icm-replication/Chart.yaml b/charts/icm-replication/Chart.yaml
@@ -3,16 +3,16 @@ appVersion: "11.9.0"
 description: Intershop Commerce Management - ICM Replication
 # name and version must be in this exact order, otherwise bump2version won't work
 name: icm-replication
-version: 2.2.0
+version: 2.2.1
 annotations:
   requestedMemoryQuota: 9Gi
   requestedCpuQuotaInMinutes: 3000
 dependencies:
   - name: icm
-    version: 2.2.0
+    version: 2.2.1
     repository: file://../icm
     alias: icm-live
   - name: icm
-    version: 2.2.0
+    version: 2.2.1
     repository: file://../icm
     alias: icm-edit
diff --git a/charts/icm-replication/RELEASE_NOTES.md b/charts/icm-replication/RELEASE_NOTES.md
@@ -1,14 +1,14 @@
 
-<a name="icm-replication-2.1.5"></a>
-## [icm-replication-2.1.5](https://github.com/intershop/helm-charts/compare/icm-replication-2.1.4...icm-replication-2.1.5)
+<a name="icm-replication-2.2.1"></a>
+## [icm-replication-2.2.1](https://github.com/intershop/helm-charts/compare/icm-replication-2.2.0...icm-replication-2.2.1)
 
-> 2024-07-08
+> 2024-07-17
 
 ### Chore
 
 * bump versions of icm:patch icm-replication:patch
 
 ### Fix
 
-* **icm:** use domain to check system status ([#736](https://github.com/intershop/helm-charts/issues/736))
+* **icm:** use logger instead of tee ([#716](https://github.com/intershop/helm-charts/issues/716))
 
diff --git a/charts/icm-replication/values-iste_linux.tmpl b/charts/icm-replication/values-iste_linux.tmpl
@@ -389,8 +389,26 @@ icm-live:
         su ${SERVER_DIRECTORY_USER} <<'EOF'
           set -x
           export PATH=$ROOTPATH
-          sh /intershop/bin/testrunner.sh -s=${TESTSUITE} -o=${RESULT_DIRECTORY} 2>&1 | tee -a ${RESULT_DIRECTORY}/istestrunner_log.txt
+          logfile=${RESULT_DIRECTORY}/istestrunner_log.txt
+          sh /intershop/bin/testrunner.sh -s=${TESTSUITE} -o=${RESULT_DIRECTORY} 2>&1 | tee outfile $logfile &
+          main_pid=$!
+
+          prev_size=0
+          update_modified_date() {
+            while kill -0 $main_pid 2>/dev/null; do
+              sleep 10
+              curr_size=$(stat -c%s "$logfile")
+              if [ "$curr_size" -ne "$prev_size" ]; then
+                touch $logfile
+                sync
+                prev_size=$curr_size
+              fi
+            done
+          }
+          update_modified_date &
+          wait $main_pid
           PROCESS_ERROR_LEVEL=$?
+
           TEST_EXECUTION_RESULT_STATUS="failed"
           if [ "${PROCESS_ERROR_LEVEL}" -eq 0 ];
           then

diff --git a/charts/icm/.bumpversion.toml b/charts/icm/.bumpversion.toml
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.2.0"
+current_version = "2.2.1"
 
 [[tool.bumpversion.files]]
 filename = "Chart.yaml"

diff --git a/charts/icm/CHANGELOG.md b/charts/icm/CHANGELOG.md
@@ -1,11 +1,38 @@
 
+<a name="icm-2.2.1"></a>
+## [icm-2.2.1](https://github.com/intershop/helm-charts/compare/icm-2.2.0...icm-2.2.1)
+
+> 2024-07-17
+
+### Chore
+
+* bump versions of icm:patch icm-replication:patch
+
+### Fix
+
+* **icm:** use logger instead of tee ([#716](https://github.com/intershop/helm-charts/issues/716))
+
+
+<a name="icm-2.2.0"></a>
+## [icm-2.2.0](https://github.com/intershop/helm-charts/compare/icm-2.1.3...icm-2.2.0)
+
+> 2024-07-09
+
+### Chore
+
+* bump versions of icm-web:minor
+* generated changelog+release notes for icm:patch icm-replication:patch
+* bump versions of icm:patch icm-replication:patch
+
+
 <a name="icm-2.1.3"></a>
 ## [icm-2.1.3](https://github.com/intershop/helm-charts/compare/icm-2.1.2...icm-2.1.3)
 
 > 2024-07-08
 
 ### Chore
 
+* generated changelog+release notes for icm:patch icm-replication:patch
 * bump versions of icm:patch icm-replication:patch
 
 ### Fix

diff --git a/charts/icm/Chart.yaml b/charts/icm/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "12.0.0"
 description: Intershop Commerce Management - ICM
 # name and version must be in this exact order, otherwise bump2version won't work
 name: icm
-version: 2.2.0
+version: 2.2.1
 # test related annotations
 annotations:
   requestedMemoryQuota: 5300Mi

diff --git a/charts/icm/RELEASE_NOTES.md b/charts/icm/RELEASE_NOTES.md
@@ -1,14 +1,14 @@
 
-<a name="icm-2.1.3"></a>
-## [icm-2.1.3](https://github.com/intershop/helm-charts/compare/icm-2.1.2...icm-2.1.3)
+<a name="icm-2.2.1"></a>
+## [icm-2.2.1](https://github.com/intershop/helm-charts/compare/icm-2.2.0...icm-2.2.1)
 
-> 2024-07-08
+> 2024-07-17
 
 ### Chore
 
 * bump versions of icm:patch icm-replication:patch
 
 ### Fix
 
-* **icm:** use domain to check system status ([#736](https://github.com/intershop/helm-charts/issues/736))
+* **icm:** use logger instead of tee ([#716](https://github.com/intershop/helm-charts/issues/716))
 
diff --git a/charts/icm/values-iste_linux.tmpl b/charts/icm/values-iste_linux.tmpl
@@ -244,8 +244,26 @@ testrunner:
       su ${SERVER_DIRECTORY_USER} <<'EOF'
         set -x
         export PATH=$ROOTPATH
-        sh /intershop/bin/testrunner.sh -s=${TESTSUITE} -o=${RESULT_DIRECTORY} 2>&1 | tee -a ${RESULT_DIRECTORY}/istestrunner_log.txt
+        logfile=${RESULT_DIRECTORY}/istestrunner_log.txt
+        sh /intershop/bin/testrunner.sh -s=${TESTSUITE} -o=${RESULT_DIRECTORY} 2>&1 | tee outfile $logfile &
+        main_pid=$!
+
+        prev_size=0
+        update_modified_date() {
+          while kill -0 $main_pid 2>/dev/null; do
+            sleep 10
+            curr_size=$(stat -c%s "$logfile")
+            if [ "$curr_size" -ne "$prev_size" ]; then
+              touch $logfile
+              sync
+              prev_size=$curr_size
+            fi
+          done
+        }
+        update_modified_date &
+        wait $main_pid
         PROCESS_ERROR_LEVEL=$?
+
         TEST_EXECUTION_RESULT_STATUS="failed"
         if [ "${PROCESS_ERROR_LEVEL}" -eq 0 ];
         then