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

Jump to bottom

Fix passing of vars to 'dashboard' target including 2nd CDash site/location, give default to CTEST_BUILD_NAME (#9079) #9139

Merged
merged 3 commits into from
May 18, 2021
Merged

Fix passing of vars to 'dashboard' target including 2nd CDash site/location, give default to CTEST_BUILD_NAME (#9079) #9139

merged 3 commits into from
May 18, 2021

Conversation

bartlettroscoe
Copy link
Member

This mostly just fixes the passing of variables in to the 'dashboard' target including the 2nd CDash site vars (which should resolve #9079). The updated documentation can be see at:

and especially see:

The TriBITS changes for this are in:

This also pulls in some other changes for TriBITS as well that include the commits:

$ cd TriBITS/
$ git log --oneline 7421484 --not 18aed92 -- tribits
d0513d3 MAJOR: dashboard target: Pass build-name and 2nd CDash site vars and pass through all non-empty vars (#370)
6c6cf50 Add USES_TERMINAL to 'dashboard' target (#370)
2e8ba59 Fix misspelling of 'and' in STDOUT (#370)
ced818c On Windows we need to use "--format=%cd" instead of --format="%cd" to prevent misinterpretation (trilinos/Trilinos#8202)
9e8a146 Strip out text about versions of CMake older than 3.17 (#299)
14075f8 Change default CMake version installed from 3.13.4 to 3.17.4 (#299)
07eb7d0 Update build ref doc on basic configuration
c86cb4c Remove spaces in include of < time.h > (trilinos/Trilinos#9104)
aefad25 Make lower-case copies of published files (SERAB-54)

Other related Trilinos GitHub issues for these TriBITS updates:

I also gave a default for CTEST_BUILD_NAME for the 'dashboard' target as related to #9079 (see commit 27abaa8).

@bartlettroscoe
Automatic snapshot commit from tribits at d0513d3
806a052 
Origin repo remote tracking branch: 'github/master'
Origin repo remote repo URL: 'github = git@github.com:TriBITSPub/TriBITS.git'

At commit:

commit d0513d3f7334abd70948d1726f7cd86fe09ea5bb
Author:  Roscoe A. Bartlett <rabartl@sandia.gov>
Date:    Thu May 13 08:49:04 2021 -0600
Summary: MAJOR: dashboard target: Pass build-name and 2nd CDash site vars and pass through all non-empty vars (trilinos#370)
@bartlettroscoe
Merge branch 'tribits_github_snapshot' into 9079-fix-dashboard-fwd-ar…
71478b8 
…gs-plus (trilinos#9079)

Also related to TriBITSPub/TriBITS#370
@bartlettroscoe
ATDM: Set CTEST_BUILD_NAME by default to env<ATDM_BUILD_NAME>-exp for…
27abaa8 
… 'dashboard' target

This only impacts the 'dashboard' target.  This gives a nicer build on CDash
when using the universal 'dashboard' target.  This should not impact the usage
of the other ctest -S drivers as part of the ATDM Trilinos configuration at
all.
@bartlettroscoe bartlettroscoe added client: ATDM Any issue primarily impacting the ATDM project ATDM Config Issues that are specific to the ATDM configuration settings ATDM DevOps Issues that will be worked by the Coordinated ATDM DevOps teams labels May 15, 2021
@bartlettroscoe bartlettroscoe requested a review from jjellio May 15, 2021 18:49
@bartlettroscoe bartlettroscoe self-assigned this May 15, 2021
@bartlettroscoe bartlettroscoe added the AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed label May 15, 2021
@bartlettroscoe bartlettroscoe mentioned this pull request May 15, 2021
Closed
@bartlettroscoe bartlettroscoe linked an issue May 15, 2021 that may be closed by this pull request
Trilinos/Tribits: make dashboard submits to SNL regardless of config parameters. #9079
Closed
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects:

Pull Request Auto Testing STARTING (click to expand)

Build Information

Test Name: Trilinos_pullrequest_gcc_8.3.0

  • Build Num: 4440
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;ATDM Config;ATDM DevOps;client: ATDM
PULLREQUESTNUM 9139
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 9079-fix-dashboard-fwd-args-plus
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27abaa8
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6d54560

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_serial

  • Build Num: 1971
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;ATDM Config;ATDM DevOps;client: ATDM
PULLREQUESTNUM 9139
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 9079-fix-dashboard-fwd-args-plus
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27abaa8
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6d54560

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_debug

  • Build Num: 2452
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;ATDM Config;ATDM DevOps;client: ATDM
PULLREQUESTNUM 9139
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 9079-fix-dashboard-fwd-args-plus
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27abaa8
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6d54560

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 9787
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;ATDM Config;ATDM DevOps;client: ATDM
PULLREQUESTNUM 9139
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 9079-fix-dashboard-fwd-args-plus
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27abaa8
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6d54560

Build Information

Test Name: Trilinos_pullrequest_cuda_10.1.105

  • Build Num: 1203
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;ATDM Config;ATDM DevOps;client: ATDM
PULLREQUESTNUM 9139
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 9079-fix-dashboard-fwd-args-plus
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27abaa8
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6d54560

Build Information

Test Name: Trilinos_pullrequest_clang_10.0.0

  • Build Num: 2568
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;ATDM Config;ATDM DevOps;client: ATDM
PULLREQUESTNUM 9139
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 9079-fix-dashboard-fwd-args-plus
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27abaa8
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6d54560

Build Information

Test Name: Trilinos_pullrequest_cuda_10.1.105_uvm_off

  • Build Num: 200
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;ATDM Config;ATDM DevOps;client: ATDM
PULLREQUESTNUM 9139
PULLREQUEST_CDASH_TRACK Experimental
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 9079-fix-dashboard-fwd-args-plus
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27abaa8
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6d54560

Build Information

Test Name: Trilinos_pullrequest_python_3

  • Build Num: 5159
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;ATDM Config;ATDM DevOps;client: ATDM
PULLREQUESTNUM 9139
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 9079-fix-dashboard-fwd-args-plus
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27abaa8
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6d54560

Using Repos:

Repo: TRILINOS (bartlettroscoe/Trilinos)
  • Branch: 9079-fix-dashboard-fwd-args-plus
  • SHA: 27abaa8
  • Mode: TEST_REPO

Pull Request Author: bartlettroscoe

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED

Pull Request Auto Testing has PASSED (click to expand)

Build Information

Test Name: Trilinos_pullrequest_gcc_8.3.0

  • Build Num: 4440
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;ATDM Config;ATDM DevOps;client: ATDM
PULLREQUESTNUM 9139
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 9079-fix-dashboard-fwd-args-plus
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27abaa8
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6d54560

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_serial

  • Build Num: 1971
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;ATDM Config;ATDM DevOps;client: ATDM
PULLREQUESTNUM 9139
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 9079-fix-dashboard-fwd-args-plus
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27abaa8
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6d54560

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_debug

  • Build Num: 2452
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;ATDM Config;ATDM DevOps;client: ATDM
PULLREQUESTNUM 9139
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 9079-fix-dashboard-fwd-args-plus
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27abaa8
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6d54560

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 9787
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;ATDM Config;ATDM DevOps;client: ATDM
PULLREQUESTNUM 9139
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 9079-fix-dashboard-fwd-args-plus
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27abaa8
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6d54560

Build Information

Test Name: Trilinos_pullrequest_cuda_10.1.105

  • Build Num: 1203
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;ATDM Config;ATDM DevOps;client: ATDM
PULLREQUESTNUM 9139
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 9079-fix-dashboard-fwd-args-plus
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27abaa8
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6d54560

Build Information

Test Name: Trilinos_pullrequest_clang_10.0.0

  • Build Num: 2568
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;ATDM Config;ATDM DevOps;client: ATDM
PULLREQUESTNUM 9139
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 9079-fix-dashboard-fwd-args-plus
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27abaa8
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6d54560

Build Information

Test Name: Trilinos_pullrequest_cuda_10.1.105_uvm_off

  • Build Num: 200
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;ATDM Config;ATDM DevOps;client: ATDM
PULLREQUESTNUM 9139
PULLREQUEST_CDASH_TRACK Experimental
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 9079-fix-dashboard-fwd-args-plus
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27abaa8
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6d54560

Build Information

Test Name: Trilinos_pullrequest_python_3

  • Build Num: 5159
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;ATDM Config;ATDM DevOps;client: ATDM
PULLREQUESTNUM 9139
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 9079-fix-dashboard-fwd-args-plus
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 27abaa8
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6d54560


CDash Test Results for PR# 9139.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Merge Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging
NO REVIEWS HAVE BEEN PERFORMED ON THIS PULL REQUEST!

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur...

2 similar comments
@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur...

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur...

@jjellio
Copy link
Contributor

jjellio commented May 18, 2021

I have this running now.

@jjellio
Copy link
Contributor

jjellio commented May 18, 2021

It seems to have worked. I set CTEST_DO_SUBMIT=OFF and the 2nd test site off - and it successfully ran the driver and did not post anywhere.

I then set CTEST_DO_SUBMIT=ON and the 1st site to SEMS SRN and the 2nd OFF - and it seems to have only posted to my SEMS site.

So all seems good.
(My actual build seems broken - but I think that is an error on my desktop) - what matters to me is that I can make a dashboard (not submit) and then manually grab the files and post them manually - which I think I can do now.

Thanks Ross!

jjellio
jjellio approved these changes May 18, 2021
View reviewed changes
Copy link
Contributor

@jjellio jjellio left a comment

Choose a reason for hiding this comment

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

This worked for me.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ jjellio ]!

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Pull Request will be Automerged

@trilinos-autotester trilinos-autotester merged commit e3d3a24 into trilinos:develop May 18, 2021
@trilinos-autotester
Copy link
Contributor

Merge on Pull Request# 9139: IS A SUCCESS - Pull Request successfully merged

@trilinos-autotester trilinos-autotester removed the AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed label May 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jjellio jjellio jjellio approved these changes

Assignees

@bartlettroscoe bartlettroscoe

Labels
ATDM Config Issues that are specific to the ATDM configuration settings ATDM DevOps Issues that will be worked by the Coordinated ATDM DevOps teams client: ATDM Any issue primarily impacting the ATDM project
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Trilinos/Tribits: make dashboard submits to SNL regardless of config parameters.
3 participants
@bartlettroscoe @trilinos-autotester @jjellio