From 411077084b721f5ccec24a57d4c7dd6a4bf668ba Mon Sep 17 00:00:00 2001 From: Tom Hampson Date: Wed, 24 Apr 2024 15:04:18 +0100 Subject: [PATCH] update main nightly deployment pipeline name --- README.md | 2 +- dev-docs/source/CondaPackageManager.rst | 2 +- dev-docs/source/ReleaseChecklist.rst | 2 +- tools/Jenkins/dependency_spotter.py | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index f5d695656cec..0160a1d8f4ad 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/dev-docs/source/CondaPackageManager.rst b/dev-docs/source/CondaPackageManager.rst index 2ea984e4bbe5..ca3dd96042fc 100644 --- a/dev-docs/source/CondaPackageManager.rst +++ b/dev-docs/source/CondaPackageManager.rst @@ -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 `_. To find the dependencies of a package: diff --git a/dev-docs/source/ReleaseChecklist.rst b/dev-docs/source/ReleaseChecklist.rst index e8eb96278c7b..361e2c62f561 100644 --- a/dev-docs/source/ReleaseChecklist.rst +++ b/dev-docs/source/ReleaseChecklist.rst @@ -383,7 +383,7 @@ Code Freeze **Create the Release Branch (once most PRs are merged)** * Ensure the latest `main nightly deployment pipeline - `__ + `__ 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 diff --git a/tools/Jenkins/dependency_spotter.py b/tools/Jenkins/dependency_spotter.py index c815044e0bab..5e50831b64a0 100644 --- a/tools/Jenkins/dependency_spotter.py +++ b/tools/Jenkins/dependency_spotter.py @@ -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 @@ -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: @@ -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, "") @@ -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 @@ -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 """ @@ -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",