Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add shaInfo target to collect all shas after the test run #651

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+88 −87
Open

Add shaInfo target to collect all shas after the test run #651

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67a6243
result
sophia-guo Dec 11, 2024
1b19413
Records all SHAs
sophia-guo Dec 11, 2024
29909e3
update shaInfor to shaInfo
sophia-guo Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions scripts/build_test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,6 @@
</if>
<echo> build.list is ${build.list} </echo>

<macrodef name="checkGitRepoSha">
<attribute name="repoDir" default="." />
<sequential>
<exec executable="bash" failonerror="true">
<arg line="${TEST_ROOT}/TKG/scripts/getSHA.sh" />
<arg line="--repo_dir @{repoDir}" />
<arg line="--output_file ${TEST_ROOT}/TKG/SHA.txt" />
</exec>
</sequential>
</macrodef>

<macrodef name="addTestenvProperties">
<attribute name="repoDir" default="." />
<attribute name="repoName" default="" />
Expand Down
71 changes: 0 additions & 71 deletions scripts/getSHA.sh
View file
Open in desktop

This file was deleted.

76 changes: 76 additions & 0 deletions scripts/getSHAs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
#!/usr/bin/env bash
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

TEST_ROOT=""
SHAs_FILE=""
workDIR=$(pwd)

usage ()
{
echo 'This script use git command to get all shas in the provided TEST_ROOT and write the info into the SHAs file'
echo 'Usage : '
echo ' --test_root_dir: optional'
echo ' --shas_file: optianal, the file to write the sha info to. Default is to ../SHAs.txt'

}

parseCommandLineArgs()
{
while [[ $# -gt 0 ]] && [[ ."$1" = .-* ]] ; do
opt="$1";
shift;
case "$opt" in
"--test_root_dir" | "-d" )
TEST_ROOT="$1"; shift;;

"--shas_file" | "-f" )
SHAs_FILE="$1"; shift;;

"--help" | "-h" )
usage; exit 0;;

*) echo >&2 "Invalid option: ${opt}"; echo "This option was unrecognized."; usage; exit 1;
esac
done
if [ -z "$TEST_ROOT" ] || [ -z "$SHAs_FILE" ] || [ ! -d "$TEST_ROOT" ]; then
echo "Error, please see the usage and also check if $TEST_ROOT is existing"
usage
exit 1
fi
}

timestamp() {
date +"%Y%m%d-%H%M%S"
}

getSHAs()
{
echo "Check shas in $TEST_ROOT and store the info in $SHAs_FILE"
if [ ! -e "${SHAs_FILE}" ]; then
echo "touch $SHAs_FILE"
touch "$SHAs_FILE"
fi

cd "$TEST_ROOT" || exit
find "$TEST_ROOT" -type d -name ".git" | while read -r gitDir; do
repoDir=$(dirname "$gitDir")
cd "$repoDir" || continue
# append the info into $SHAs_FILR
{ echo "================================================"; echo "timestamp: $(timestamp)"; echo "repo dir: $repoDir"; echo "git repo: "; git remote show origin -n | grep "Fetch URL:"; echo "sha:"; git rev-parse HEAD; } 2>&1 | tee -a "$SHAs_FILE"
done
}
parseCommandLineArgs "$@"
getSHAs
cd "$workDIR" || exit

6 changes: 3 additions & 3 deletions scripts/resultsSum.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,11 +361,11 @@ sub resultReporter {
my $host = hostname;
print $fhOut "# Hostname: " . $host . "\n\n";

#add SHA.txt content in TAP file
my $SHAFile = $tapPath."../SHA.txt";
#add SHAs.txt content in TAP file
my $SHAFile = $tapPath."../SHAs.txt";
my $SHAContent = `cat $SHAFile`;
$SHAContent =~ s/\n/\n# /g;
print $fhOut "#SHA.txt content: \n# " . $SHAContent . "\n";
print $fhOut "#SHAs.txt content: \n# " . $SHAContent . "\n";

print $fhOut "# Timestamp: " . $timeStamp . " UTC \n";

Expand Down
11 changes: 9 additions & 2 deletions settings.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# limitations under the License.
##############################################################################

.PHONY: help rmResultFile resultsSummary
.PHONY: help rmResultFile shaInfor resultsSummary

help:
@echo "This makefile is used to build and execute JVM tests. You should specify the following"
Expand Down Expand Up @@ -364,7 +364,7 @@ $(SUBDIRS_TESTTARGET):

$(TESTTARGET): $(SUBDIRS_TESTTARGET)

_$(TESTTARGET): setup_$(TESTTARGET) rmResultFile $(TESTTARGET) resultsSummary teardown_$(TESTTARGET)
_$(TESTTARGET): setup_$(TESTTARGET) rmResultFile $(TESTTARGET) shaInfor resultsSummary teardown_$(TESTTARGET)
Copy link
Contributor

@llxia llxia Dec 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Does it make sense to have shaInfor before running the test? In the event of a crash, we will still retain the SHA information.
  • Could we rename shaInfor to shaInfo?

Copy link
Contributor Author

@sophia-guo sophia-guo Dec 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It can be done right after make compile. https://ci.adoptium.net/view/Test_grinder/job/Grinder/12117/ https://ci.adoptium.net/view/Test_grinder/job/Grinder/12118/

However it depends on what the crash is. If the crash exit the job instantly ( https://ci.adoptium.net/view/Test_grinder/job/Grinder/12124/console, this is not a test crash, still explain the scenario) , SHAs.txt is available but *.tap file unavailable, which won't help jenkins story unless we also archive it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to shaInfo

@$(ECHO) $@ done

.PHONY: _$(TESTTARGET) $(TESTTARGET) $(SUBDIRS) $(SUBDIRS_TESTTARGET)
Expand Down Expand Up @@ -443,6 +443,13 @@ endif
rmResultFile:
@$(RM) $(Q)$(TEMPRESULTFILE)$(Q)

shaInfor:
@$(ECHO_NEWLINE)
@$(ECHO_NEWLINE)
@$(ECHO) $(Q)Collect all REPOs sha $(Q)
$(CD) $(Q)$(TEST_ROOT)$(D)TKG$(D)scripts$(Q); \
bash $(Q)getSHAs.sh$(Q) --test_root_dir $(Q)$(TEST_ROOT)$(Q) --shas_file $(Q)$(TEST_ROOT)$(D)TKG$(D)SHAs.txt$(Q)

resultsSummary:
@$(ECHO_NEWLINE)
@$(ECHO_NEWLINE)
Expand Down
Loading