werft: Fix weird repeat running behavior

#12795

Author: utam0k

.werft/ide-integration-tests-startup.yaml

@@ -67,6 +67,7 @@ pod:
           sudo chown -R gitpod:gitpod /workspace
 
           # Fix weird repeat running behavior
+          # https://github.com/gitpod-io/gitpod/issues/12795
           LAST_COMMIT_MSG=$(git log --pretty=format:"%s" -1)
           if [[ $LAST_COMMIT_MSG =~ "integration test" ]]; then exit 0; fi
 

.werft/workspace-run-integration-tests.sh

@@ -2,6 +2,12 @@
 
 set -euo pipefail
 
+TEMP_COMMIT_MSG="integration test"
+# TODO(toru): Fix weird repeat running behavior
+# https://github.com/gitpod-io/gitpod/issues/12795
+LAST_COMMIT_MSG=$(git log --pretty=format:"%s" -1)
+if [[ $LAST_COMMIT_MSG == "$TEMP_COMMIT_MSG" ]]; then exit 0; fi
+
 BRANCH="wk-inte-test/"$(date +%Y%m%d%H%M%S)
 FAILURE_COUNT=0
 RUN_COUNT=0 # Prevent multiple cleanup runs
@@ -19,19 +25,19 @@ function cleanup ()
     fi
     DO_CLEANUP=1
     werft log phase "slack notification and cleanup $SIGNAL" "Slack notification and cleanup: $SIGNAL"
-    
+
     werftJobUrl="https://werft.gitpod-dev.com/job/${context_name}"
-    
+
     if [ "${RUN_COUNT}" -eq "0" ]; then
         title=":x: *Workspace integration test fail*"
         title=$title"\n_Repo:_ ${context_repo}\n_Build:_ ${context_name}"
-        
+
         errs="Failed at preparing the preview environment"
         BODY="{\"blocks\":[{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"${title}\"},\"accessory\":{\"type\":\"button\",\"text\":{\"type\":\"plain_text\",\"text\":\":werft: Go to Werft\",\"emoji\":true},\"value\":\"click_me_123\",\"url\":\"${werftJobUrl}\",\"action_id\":\"button-action\"}},{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"\`\`\`\\n${errs}\\n\`\`\`\"}}]}"
     elif [ "${FAILURE_COUNT}" -ne "0" ]; then
         title=":x: *Workspace integration test fail*"
         title=$title"\n_Repo:_ ${context_repo}\n_Build:_ ${context_name}"
-      
+
         errs=""
         for TEST_NAME in ${!FAILURE_TESTS[*]}; do
           title=$title"\n_Tests_: ${TEST_NAME}"
@@ -41,21 +47,21 @@ function cleanup ()
         BODY="{\"blocks\":[{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"${title}\"},\"accessory\":{\"type\":\"button\",\"text\":{\"type\":\"plain_text\",\"text\":\":werft: Go to Werft\",\"emoji\":true},\"value\":\"click_me_123\",\"url\":\"${werftJobUrl}\",\"action_id\":\"button-action\"}},{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"\`\`\`\\n${errs}\\n\`\`\`\"}}]}"
     else
         title=":white_check_mark: *Workspace integration test pass*"
-      
+
         title=$title"\n_Repo:_ ${context_repo}\n_Build:_ ${context_name}"
         BODY="{\"blocks\":[{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"${title}\"},\"accessory\":{\"type\":\"button\",\"text\":{\"type\":\"plain_text\",\"text\":\":werft: Go to Werft\",\"emoji\":true},\"value\":\"click_me_123\",\"url\":\"${werftJobUrl}\",\"action_id\":\"button-action\"}}]}"
     fi
-    
+
     echo "Sending Slack notificaition" | werft log slice "slack notification"
     curl -X POST \
       -H 'Content-type: application/json' \
       -d "${BODY}" \
       "https://hooks.slack.com/${SLACK_NOTIFICATION_PATH}"
     werft log result "slack notification" "${PIPESTATUS[0]}"
     werft log slice "slack notification" --done
-    
+
     git push origin :"${BRANCH}" | werft log slice "clean up"
-    
+
     echo "Finished cleaning up based on signal $SIGNAL" | werft log slice "clean up"
     werft log slice "clean up" --done
 }
@@ -73,7 +79,7 @@ werft log phase "build preview environment" "build preview environment"
 # Create a new branch and asks Werft to create a preview environment for it
 ( \
     git checkout -B "${BRANCH}" && \
-    git commit -m "integration test" --allow-empty  && \
+    git commit -m "${TEMP_COMMIT_MSG}" --allow-empty  && \
     git push --set-upstream origin "${BRANCH}" && \
     werft run github -a with-preview=true
 ) | werft log slice "build preview environment"