Skip to content

Commit

Permalink
update cdash server (#195)
Browse files Browse the repository at this point in the history
Co-authored-by: benjaminmenetrier <[email protected]>
  • Loading branch information
mer-a-o and benjaminmenetrier authored Mar 22, 2022
1 parent e5b785a commit 86c530d
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 17 deletions.
8 changes: 6 additions & 2 deletions CI/buildspec_clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ phases:
- echo $CODEBUILD_WEBHOOK_TRIGGER
- echo $CODEBUILD_WEBHOOK_BASE_REF

# read cdash url from s3
- wget https://ci-test-cdash-url.s3.amazonaws.com/cdash_url.txt
- CDASH_URL=$(cat cdash_url.txt)

# Codebuild only runs on PUSH events if HEAD_REF
# is refs/heads/develop (merge to develop). In this
# case CODEBUILD_GIT_BRANCH="develop"
Expand Down Expand Up @@ -74,6 +78,7 @@ phases:
- cp CMakeLists.txt /jcsda/saber-bundle
- cp -r cmake /jcsda/saber-bundle/
- cp /jcsda/saber-bundle/cmake/CTestConfig.cmake /jcsda/saber-bundle
- sed -i "s@CDASH_URL@$CDASH_URL@g" /jcsda/saber-bundle/CTestConfig.cmake

# print list
- cd /jcsda/saber-bundle
Expand Down Expand Up @@ -120,8 +125,7 @@ phases:
# upload find cdash url and upload it as CodeBuild artifact to S3
- if [ "$BUILD_STATUS" = "1" ];
then echo "Build & tests passed, find cdash url";
bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /build_container/saber/Testing;
url=$(bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /build_container/saber/Testing);
url=$(bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /build_container/saber/Testing $CDASH_URL);
echo $url;
echo ${url} > /jcsda/artifacts/cdash-url.txt;
cat /jcsda/artifacts/cdash-url.txt;
Expand Down
8 changes: 6 additions & 2 deletions CI/buildspec_gnu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ phases:
- echo "CODEBUILD_GIT_BRANCH=${CODEBUILD_GIT_BRANCH}"
- echo "CODEBUILD_SOURCE_VERSION=${CODEBUILD_SOURCE_VERSION}"

# read cdash url from s3
- wget https://ci-test-cdash-url.s3.amazonaws.com/cdash_url.txt
- CDASH_URL=$(cat cdash_url.txt)

pre_build:
commands:
- echo Executing pre_build phase
Expand Down Expand Up @@ -67,6 +71,7 @@ phases:

# cdash upload setup
- cp /jcsda/saber-bundle/cmake/CTestConfig.cmake /jcsda/saber-bundle/
- sed -i "s@CDASH_URL@$CDASH_URL@g" /jcsda/saber-bundle/CTestConfig.cmake
- chmod -R 777 /jcsda/saber-bundle

build:
Expand Down Expand Up @@ -122,8 +127,7 @@ phases:
# upload find cdash url and upload it as CodeBuild artifact to S3
- if [ "$BUILD_STATUS" = "1" ];
then echo "Build & tests passed, find cdash url";
bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /home/jedi/saber/Testing;
url=$(bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /home/jedi/saber/Testing);
url=$(bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /home/jedi/saber/Testing $CDASH_URL);
echo $url;
echo ${url} > /jcsda/artifacts/cdash-url.txt;
cat /jcsda/artifacts/cdash-url.txt;
Expand Down
8 changes: 6 additions & 2 deletions CI/buildspec_intel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ phases:
- cd CI
- . /etc/profile.d/intel.sh

# read cdash url from s3
- wget https://ci-test-cdash-url.s3.amazonaws.com/cdash_url.txt
- CDASH_URL=$(cat cdash_url.txt)

# jedi-cmake
- ./clone.sh $GIT_USER $GIT_PASS jcsda-internal/jedi-cmake $CODEBUILD_GIT_BRANCH jedicmake /jcsda/saber-bundle develop

Expand All @@ -73,6 +77,7 @@ phases:

# cdash upload setup
- cp /jcsda/saber-bundle/cmake/CTestConfig.cmake /jcsda/saber-bundle/
- sed -i "s@CDASH_URL@$CDASH_URL@g" /jcsda/saber-bundle/CTestConfig.cmake
- chmod 777 -R /jcsda/saber-bundle

# print list
Expand Down Expand Up @@ -140,8 +145,7 @@ phases:
# upload find cdash url and upload it as CodeBuild artifact to S3
- if [ "$BUILD_STATUS" = "1" ];
then echo "Build & tests passed, find cdash url";
bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /home/jedi/saber/Testing;
url=$(bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /home/jedi/saber/Testing);
url=$(bash /jcsda/saber-bundle/saber/CI/cdash-url.sh /home/jedi/saber/Testing $CDASH_URL);
echo $url;
echo ${url} > /jcsda/artifacts/cdash-url.txt;
cat /jcsda/artifacts/cdash-url.txt;
Expand Down
3 changes: 2 additions & 1 deletion CI/cdash-url.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/bin/bash

dir=$1
cdash_url=$2
tag=$(head -1 $dir/TAG)
Done=$(cat $dir/$tag/Done.xml)
buildID=$(echo $Done | grep -o -P '(?<=buildId>).*(?=</build)')
URL=https://cdash.jcsda.org/buildSummary.php?buildid=$buildID
URL=$cdash_url/viewTest.php?buildid=$buildID
echo $URL
7 changes: 2 additions & 5 deletions CI/cmake/CTestConfig.cmake
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
set(CTEST_PROJECT_NAME "JEDI")
set(CTEST_PROJECT_NAME "saber")
set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
set(CTEST_DROP_METHOD "https")
set(CTEST_DROP_SITE "cdash.jcsda.org")
set(CTEST_DROP_SITE_CDASH TRUE)
set(CTEST_SUBMIT_URL "CDASH_URL/submit.php?project=${CTEST_PROJECT_NAME}")
set(CTEST_USE_LAUNCHERS 1)
set(ENV{CTEST_USE_LAUNCHERS_DEFAULT} 1)
set(CTEST_LABELS_FOR_SUBPROJECTS saber)
set(CTEST_DROP_LOCATION "/submit.php?project=saber")
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
### Continuous integration:
| Platform | JCSDA-internal | JCSDA |
| ------------- | ------------- |------------- |
| GNU | [![AWS-gnu](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoieXA5WFFUZk5NMDVvV0ZkZVBQUDRVeFN3VDk5aVkvZHJ0K3ZWaEl6RlVZNGdCTEI0Y283QU5TTzVTS0k0N0hNYjl4allwY21SRlFWVjJYTEFjSlJUUlZVPSIsIml2UGFyYW1ldGVyU3BlYyI6ImxZNTZLc3VXcGNVYktCeVQiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/saber-internal-gnu/history) | [![AWS-gnu](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiV2dVMmxFVENKL2dCVzN5UlgyZHJuSmhvbTV6dDhOalYwTEJDaXdZWGFDbXp2YlU4VzdsV3ZRNm9mT25mRnM3NlVYWXE2R2pmYVlZbWhxbHJ1OXFpdzVjPSIsIml2UGFyYW1ldGVyU3BlYyI6Ilp2T04vNnBRR0xFYmQ3UzAiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/automated-testing-saber-gnu/history)
| Intel | [![AWS-intel](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoidC9ZWmlyNU8xZmdjd0kxbFJzcGVNTlhJSDdBcFJ4RUdwNjNmcnFzQ1VWUUNaMWFEZkwvbHlkZUxTaTZIZlQyWWxOMGtvVzRaTlpRNGdjbFVUK0ZaRDFvPSIsIml2UGFyYW1ldGVyU3BlYyI6IllwQlZTb2JNdnJjOEo5TlgiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/saber-internal-intel/history) | [![AWS-intel](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiYUROTE5DZVdranpBQTBKbTlBam1vb2pVWXJteDdEMk1RLzhWdmlQU2NUQUhueFF2UnhINWxDcGZ1eWFqcFpBUVRDMGpYdVhzSWdmazNYcmRDeUdOd0xRPSIsIml2UGFyYW1ldGVyU3BlYyI6IjhqZnUxOHpObWFGSnFtUzYiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/automated-testing-saber-intel/history)
| CLANG | [![AWS-clang](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoicnRqWEh6YUg1UEx2OWE5QVpXb2RjVDFCeitJV3ROaEkxVGVnYnRNYWMzR0J0Z2xPZFhTZlEvVUFiL1BoUjJzcVh3V3BSaTRaSVFnK2dSdGtMcnd5S2o4PSIsIml2UGFyYW1ldGVyU3BlYyI6IjFVTEtZRTNpQXJMR0NYRCsiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/saber-internal-clang/history) | [![AWS-clang](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiL3NrZ05zdXQzbmlhOTJOT0RVanBwKzhocXhIb0tpdnFFMzAzdjd6RmN4V0FpRTJMVkdYcGJoVS9CTlE0L3dXS3JvclZxZU12U0lVWjdBb3krZ2xzODBBPSIsIml2UGFyYW1ldGVyU3BlYyI6IklHcGQ0VUJNOWdzNHNyWE0iLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/automated-testing-saber-clang/history)
| Platform | JCSDA-internal |
| ------------- | ------------- |
| GNU | [![AWS-gnu](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoieXA5WFFUZk5NMDVvV0ZkZVBQUDRVeFN3VDk5aVkvZHJ0K3ZWaEl6RlVZNGdCTEI0Y283QU5TTzVTS0k0N0hNYjl4allwY21SRlFWVjJYTEFjSlJUUlZVPSIsIml2UGFyYW1ldGVyU3BlYyI6ImxZNTZLc3VXcGNVYktCeVQiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/saber-internal-gnu/history) |
| Intel | [![AWS-intel](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoidC9ZWmlyNU8xZmdjd0kxbFJzcGVNTlhJSDdBcFJ4RUdwNjNmcnFzQ1VWUUNaMWFEZkwvbHlkZUxTaTZIZlQyWWxOMGtvVzRaTlpRNGdjbFVUK0ZaRDFvPSIsIml2UGFyYW1ldGVyU3BlYyI6IllwQlZTb2JNdnJjOEo5TlgiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/saber-internal-intel/history) |v
| CLANG | [![AWS-clang](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoicnRqWEh6YUg1UEx2OWE5QVpXb2RjVDFCeitJV3ROaEkxVGVnYnRNYWMzR0J0Z2xPZFhTZlEvVUFiL1BoUjJzcVh3V3BSaTRaSVFnK2dSdGtMcnd5S2o4PSIsIml2UGFyYW1ldGVyU3BlYyI6IjFVTEtZRTNpQXJMR0NYRCsiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/saber-internal-clang/history) |
| Code Coverage | [![codecov](https://codecov.io/gh/JCSDA-internal/saber/branch/develop/graph/badge.svg?token=GKZ5TMF2GW)](https://codecov.io/gh/JCSDA-internal/saber) |

# SABER
Expand Down

0 comments on commit 86c530d

Please sign in to comment.