Skip to content

Commit

Permalink
Merge pull request #37207 from mantidproject/rename_main_pipeline
Browse files Browse the repository at this point in the history
Update references to main_nightly_deployment pipeline
  • Loading branch information
SilkeSchomann committed Apr 26, 2024
2 parents e7e3a54 + 4110770 commit 03b15d3
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -12,4 +12,4 @@ Useful links
* Build server: https://builds.mantidproject.org
* Developer site: https://developer.mantidproject.org

[![Build Status](https://builds.mantidproject.org/buildStatus/icon?job=main_nightly_deployment_prototype)](https://builds.mantidproject.org/job/main_nightly_deployment_prototype)
[![Build Status](https://builds.mantidproject.org/buildStatus/icon?job=main_nightly_deployment)](https://builds.mantidproject.org/job/main_nightly_deployment)
2 changes: 1 addition & 1 deletion dev-docs/source/CondaPackageManager.rst
Expand Up @@ -60,7 +60,7 @@ few examples on how to use it:
python dependency_spotter.py -f 593 -s 598
python dependency_spotter.py -f 593 -s 598 -os win-64
python dependency_spotter.py -f 593 -s 598 --pipeline main_nightly_deployment_prototype
python dependency_spotter.py -f 593 -s 598 --pipeline main_nightly_deployment
Another useful command for investigating the dependencies of specific packages is `conda search <https://docs.conda.io/projects/conda/en/latest/commands/search.html>`_. To find the dependencies of a package:

Expand Down
2 changes: 1 addition & 1 deletion dev-docs/source/ReleaseChecklist.rst
Expand Up @@ -383,7 +383,7 @@ Code Freeze
**Create the Release Branch (once most PRs are merged)**

* Ensure the latest `main nightly deployment pipeline
<https://builds.mantidproject.org/view/Nightly%20Pipelines/job/main_nightly_deployment_prototype/>`__
<https://builds.mantidproject.org/view/Nightly%20Pipelines/job/main_nightly_deployment/>`__
has passed for all build environments. If it fails, decide if a fix is needed before moving on to
the next steps.
* Click ``Build Now`` on `open-release-testing
Expand Down
14 changes: 7 additions & 7 deletions tools/Jenkins/dependency_spotter.py
Expand Up @@ -11,8 +11,8 @@
Example use:
dependency_spotter -f 593 -s 598
dependency_spotter -f 593 -s 598 -os win-64
dependency_spotter -f 593 -s 598 --pipeline main_nightly_deployment_prototype
This will compare builds 593 and 598 from the "main_nightly_deployment_prototype" pipeline
dependency_spotter -f 593 -s 598 --pipeline main_nightly_deployment
This will compare builds 593 and 598 from the "main_nightly_deployment" pipeline
"""

import argparse
Expand All @@ -27,7 +27,7 @@ def dependency_spotter(os_name: str, first_build: int, second_build: int, pipeli
:param os_name: Operating string label, e.g. linux-64
:param first_build: Build number of the first build for comparison
:param second_build: Build number of the second build for comparison
:param pipeline: Name of the Jenkins pipeline, e.g. main_nightly_deployment_prototype
:param pipeline: Name of the Jenkins pipeline, e.g. main_nightly_deployment
:param log_file: Name of the file to compare, e.g. mantid_build_environment.txt
"""
if second_build < first_build:
Expand Down Expand Up @@ -93,7 +93,7 @@ def extract_available_log_files(os_name: str, build_number: int, pipeline: str)
available files, e.g. mantid_build_environment.txt. Returns a list of these filenames
:param os_name: Operating string label, e.g. linux-64
:param build_number: Build number
:param pipeline: Name of the Jenkins pipeline, e.g. main_nightly_deployment_prototype
:param pipeline: Name of the Jenkins pipeline, e.g. main_nightly_deployment
:return: List of log file names
"""
url = form_url_for_build_artifact(build_number, os_name, pipeline, "")
Expand All @@ -115,7 +115,7 @@ def compare_dependencies_for_file(os_name: str, first_build: int, second_build:
:param os_name: Operating string label, e.g. linux-64
:param first_build: Build number of the first build for comparison
:param second_build: Build number of the second build for comparison
:param pipeline: Name of the Jenkins pipeline, e.g. main_nightly_deployment_prototype
:param pipeline: Name of the Jenkins pipeline, e.g. main_nightly_deployment
:param log_file: Name of the file to compare, e.g. mantid_build_environment.txt
"""
# Form URLs for each build artifact file
Expand Down Expand Up @@ -174,7 +174,7 @@ def form_url_for_build_artifact(build_number: int, os_name: str, pipeline: str,
Form Jenkins URL from specified info.
:param build_number: Build number
:param os_name: Operating string label, e.g. linux-64
:param pipeline: Name of the Jenkins pipeline, e.g. main_nightly_deployment_prototype
:param pipeline: Name of the Jenkins pipeline, e.g. main_nightly_deployment
:param log_file: Name of the file to compare, e.g. mantid_build_environment.txt
:return: URL for build artifact
"""
Expand Down Expand Up @@ -208,7 +208,7 @@ def extract_package_versions(url: str, os_name: str) -> Dict[str, str]:
parser.add_argument("-os", help="Operating system string, e.g. linux-64", default="linux-64", type=str)
parser.add_argument("--first", "-f", help="First (usually passing) build number", type=int, required=True)
parser.add_argument("--second", "-s", help="Second (usually failing) build number", type=int, required=True)
parser.add_argument("--pipeline", "-p", help="Build pipeline", default="main_nightly_deployment_prototype", type=str)
parser.add_argument("--pipeline", "-p", help="Build pipeline", default="main_nightly_deployment", type=str)
parser.add_argument(
"--logfile",
"-l",
Expand Down

0 comments on commit 03b15d3

Please sign in to comment.