From fd7e94022be03bf7f18646eddf1416295247ca96 Mon Sep 17 00:00:00 2001 From: Artem Ryabov Date: Thu, 16 Jan 2020 13:43:28 +0300 Subject: [PATCH] Fixed several Mellanox Open MPI CI issues. The following issues have been fixed: - Corrected the link to CI status badge in README after some renaming. - Updated agent capabilities. - Switched to jenkins_scripts from master branch. - Corrected support e-mail. Signed-off-by: Artem Ryabov --- .ci/README.md | 4 ++-- .ci/mellanox/azure-pipelines.yml | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.ci/README.md b/.ci/README.md index 7b11ed7244..b1e3bbabc6 100644 --- a/.ci/README.md +++ b/.ci/README.md @@ -1,6 +1,6 @@ # Open MPI Continuous Integration (CI) Services ## Mellanox Open MPI CI -[![Build Status](https://dev.azure.com/mlnx-swx/mellanox-ompi-ci-project/_apis/build/status/mellanox-ompi-ci-pipeline?branchName=master)](https://dev.azure.com/mlnx-swx/mellanox-ompi-ci-project/_build/latest?definitionId=6&branchName=master) +[![Build Status](https://dev.azure.com/mlnx-swx/mellanox-ompi/_apis/build/status/Mellanox%20CI?branchName=master)](https://dev.azure.com/mlnx-swx/mellanox-ompi/_build/latest?definitionId=9&branchName=master) ### Scope [Mellanox](https://www.mellanox.com/) Open MPI CI is intended to verify Open MPI with recent Mellanox SW components ([Mellanox OFED](https://www.mellanox.com/page/products_dyn?product_family=26), [UCX](https://www.mellanox.com/page/products_dyn?product_family=281&mtag=ucx) and other [HPC-X](https://www.mellanox.com/page/products_dyn?product_family=189&mtag=hpc-x) components) in the Mellanox lab environment. @@ -15,4 +15,4 @@ Mellanox Open MPI CI is triggered upon the following events: * Create a pull request (PR). CI status is visible in the PR status. CI is restarted automatically upon each new commit within the PR. CI status and log files are also available on the Azure DevOps server. * Trigger CI with special PR comments (for example, `/azp run`). Comment triggers are available only if the comment author has write permission to the PR target repo. Detailed information about comment triggers is available in the official Azure DevOps [documentation](https://docs.microsoft.com/en-us/azure/devops/pipelines/repos/github?view=azure-devops&tabs=yaml#comment-triggers). ### Support -In case of any issues, questions or suggestions please contact to [Mellanox Open MPI CI support team](mailto:artemry@mellanox.com;andreyma@mellanox.com). +In case of any issues, questions or suggestions please contact to [Mellanox Open MPI CI support team](mailto:swx-azure-svc@mellanox.com). diff --git a/.ci/mellanox/azure-pipelines.yml b/.ci/mellanox/azure-pipelines.yml index 223ced0af6..8992354e92 100644 --- a/.ci/mellanox/azure-pipelines.yml +++ b/.ci/mellanox/azure-pipelines.yml @@ -9,14 +9,13 @@ pr: pool: name: Default - demands: AGENT_CI_CAPABILITY -equals ompi + demands: + - AGENT_CI_TARGET -equals ompi + - MLNX_IB_DEVICE -equals yes variables: - # TODO: change to the main repo and master branch - #ompi_jenkins_scripts_git_repo_url: https://github.com/mellanox-hpc/jenkins_scripts.git - ompi_jenkins_scripts_git_repo_url: https://github.com/itemko/jenkins_scripts.git - #ompi_jenkins_scripts_git_branch: master - ompi_jenkins_scripts_git_branch: artemry/ompi_review + ompi_jenkins_scripts_git_repo_url: https://github.com/mellanox-hpc/jenkins_scripts.git + ompi_jenkins_scripts_git_branch: master # Enable debug information, supported values: true, false debug: true