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.

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

Require exclude listing of SEMSDevEnv.cmake, remove load_ci_sems_dev_env.sh (#482) #2374

Merged

Conversation

bartlettroscoe
Copy link
Member

@bartlettroscoe bartlettroscoe commented Mar 13, 2018

The logic that resulted in the SEMSDevEnv.cmake file getting picked up was a
little too magical. Therefore, this change is to require that you explicitly
list cmake/std/sems/SEMSDevEnv.cmake in the Trilinos_CONFIGURE_OPTIONS_FILE
argument. This also got rid of the StdDevEnvs.cmake file and gets rid of that
appraoch. Having to list a single file in Trilinos_CONFIGURE_OPTIONS_FILE is
not that big of a deal and it is explicit with no magic.

I also got rid of the script load_ci_sems_dev_env.sh because it just soruces
load_sems_env.sh with no arguments by default anyway and we will maintain that
going forward. This just reduces clutter.

I also made it so you can pull in SEMSDevEnv.cmake with -C <full_path>/SEMSDevEnv.cmake instead of with -DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=<rel_path>/SEMSDevEnv.cmake.

Related issues:

…env.sh (trilinos#482)

The logic that resulted in the SEMSDevEnv.cmake file getting picked up was a
little too magical.  Therefore, this change is to require that you explictily
list cmake/std/sems/SEMSDevEnv.cmake in the Trilinos_CONFIGURE_OPTIONS_FILE
argument.  This also got rid of the StdDevEnvs.cmake file and gets rid of that
appraoch.  Having to list a single file in Trilinos_CONFIGURE_OPTIONS_FILE is
not that big of a deal and it is explicit with no magic.

I also got rid of the script load_ci_sems_dev_env.sh because it just soruces
load_sems_env.sh with no arguments by default anyway and we will maintain that
going forward.  This just reduces clutter.
@bartlettroscoe bartlettroscoe added the stage: in progress Work on the issue has started label Mar 13, 2018
This is replaced with the "atdm" stuff (see TRIL-171).
@trilinos-autotester
Copy link
Contributor

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

For those that like to use -C instead of -DTrilinos_CONFIGURE_OPTIONS_FILE now
you can read this in with -C.  But you will need to provide the entire path
and can't provide a relative path like with
-DTrilinos_CONFIGURE_OPTIONS_FILE:STIRNG=<rel-path>.
@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_autotester_test

  • Build Num: 479
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.8.4
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2374
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 482-simplify-sems-dev-env
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 2cc01a3
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 3e6c101

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3

  • Build Num: 344
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.9.3
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2374
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 482-simplify-sems-dev-env
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 2cc01a3
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 3e6c101

Build Information

Test Name: Trilinos_pullrequest_gcc_4.8.4

  • Build Num: 61
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.8.4
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2374
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 482-simplify-sems-dev-env
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 2cc01a3
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 3e6c101

Using Repos:

Repo: TRILINOS (bartlettroscoe/Trilinos)
  • Branch: 482-simplify-sems-dev-env
  • SHA: 2cc01a3
  • Mode: TEST_REPO

Pull Request Author: bartlettroscoe

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - ERROR: A user has commited a change to the PR before testing completed. The testing SHA = 2cc01a3 Does not match the current commit SHA = 1188e55. Testing of this PR must occur again.

@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_autotester_test

  • Build Num: 481
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.8.4
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2374
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 482-simplify-sems-dev-env
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 1188e55
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 3e6c101

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3

  • Build Num: 346
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.9.3
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2374
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 482-simplify-sems-dev-env
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 1188e55
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 3e6c101

Build Information

Test Name: Trilinos_pullrequest_gcc_4.8.4

  • Build Num: 63
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.8.4
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2374
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 482-simplify-sems-dev-env
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 1188e55
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 3e6c101

Using Repos:

Repo: TRILINOS (bartlettroscoe/Trilinos)
  • Branch: 482-simplify-sems-dev-env
  • SHA: 1188e55
  • 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_autotester_test

  • Build Num: 481
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.8.4
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2374
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 482-simplify-sems-dev-env
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 1188e55
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 3e6c101

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3

  • Build Num: 346
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.9.3
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2374
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 482-simplify-sems-dev-env
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 1188e55
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 3e6c101

Build Information

Test Name: Trilinos_pullrequest_gcc_4.8.4

  • Build Num: 63
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.8.4
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2374
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 482-simplify-sems-dev-env
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 1188e55
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 3e6c101

@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
WARNING: NO REVIEWERS HAVE BEEN REQUESTED FOR THIS PULL REQUEST!

@trilinos-autotester
Copy link
Contributor

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

@bartlettroscoe bartlettroscoe merged commit 1188e55 into trilinos:develop Mar 14, 2018
@bartlettroscoe bartlettroscoe removed the stage: in progress Work on the issue has started label Mar 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants