From 686f7885f643d7ac316b9b0152282fa02042bd02 Mon Sep 17 00:00:00 2001 From: Feruzjon Muyassarov Date: Thu, 23 Dec 2021 11:20:47 +0200 Subject: [PATCH] Switch to main in project-infra references --- jenkins/README.md | 12 ++++++------ jenkins/jobs/bml_integration_tests.pipeline | 4 ++-- jenkins/jobs/integration_tests.pipeline | 4 ++-- jenkins/jobs/integration_tests_clean.pipeline | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jenkins/README.md b/jenkins/README.md index 845c0ebb..eafa0044 100644 --- a/jenkins/README.md +++ b/jenkins/README.md @@ -86,14 +86,14 @@ added/removed in Jenkins UI under [airship window](https://jenkins.nordix.org/vi ### Job Declarative Pipeline We use [declarative pipeline syntax](https://www.jenkins.io/doc/book/pipeline/syntax/) to tell what we want to do -when Jenkins executes our pipeline. Pipelines are stored in [metal3-io/project-infra](https://github.com/metal3-io/project-infra/tree/master/jenkins/jobs) repository. -In a nutshell, pipelines defines sequence of steps to be executed. Each step can run a script or perform something else. For example, [integration_tests.pipeline](https://github.com/metal3-io/project-infra/blob/master/jenkins/jobs/integration_tests.pipeline) executes following scripts +when Jenkins executes our pipeline. Pipelines are stored in [metal3-io/project-infra](https://github.com/metal3-io/project-infra/tree/main/jenkins/jobs) repository. +In a nutshell, pipelines defines sequence of steps to be executed. Each step can run a script or perform something else. For example, [integration_tests.pipeline](https://github.com/metal3-io/project-infra/blob/main/jenkins/jobs/integration_tests.pipeline) executes following scripts 1. [clones](https://github.com/metal3-io/project-infra/blob/0a6cc3f9f8592914a316c27ea2411ccb48aba7c3/jenkins/jobs/integration_tests.pipeline#L65) git repository -2. [jenkins/scripts/integration_test.sh](https://github.com/metal3-io/project-infra/blob/master/jenkins/scripts/integration_test.sh) -3. [jenkins/scripts/fetch_logs.sh](https://github.com/metal3-io/project-infra/blob/master/jenkins/scripts/fetch_logs.sh) -4. [jenkins/scripts/integration_test_clean.sh](https://github.com/metal3-io/project-infra/blob/master/jenkins/scripts/integration_test_clean.sh) -5. [jenkins/scripts/integration_delete.sh](https://github.com/metal3-io/project-infra/blob/master/jenkins/scripts/integration_delete.sh) +2. [jenkins/scripts/integration_test.sh](https://github.com/metal3-io/project-infra/blob/main/jenkins/scripts/integration_test.sh) +3. [jenkins/scripts/fetch_logs.sh](https://github.com/metal3-io/project-infra/blob/main/jenkins/scripts/fetch_logs.sh) +4. [jenkins/scripts/integration_test_clean.sh](https://github.com/metal3-io/project-infra/blob/main/jenkins/scripts/integration_test_clean.sh) +5. [jenkins/scripts/integration_delete.sh](https://github.com/metal3-io/project-infra/blob/main/jenkins/scripts/integration_delete.sh) ### GitHub Pull Request Builder, a.k.a. ghprb diff --git a/jenkins/jobs/bml_integration_tests.pipeline b/jenkins/jobs/bml_integration_tests.pipeline index 3388387f..d08f90c5 100644 --- a/jenkins/jobs/bml_integration_tests.pipeline +++ b/jenkins/jobs/bml_integration_tests.pipeline @@ -9,8 +9,8 @@ script { ci_git_branch="${ghprbActualCommit}" ci_git_url = "${ghprbAuthorRepoGitUrl}" } else { - echo "Checkout ${ghprbAuthorRepoGitUrl} master" - ci_git_branch = "master" + echo "Checkout ${ghprbAuthorRepoGitUrl} main" + ci_git_branch = "main" ci_git_url = "https://github.com/metal3-io/project-infra.git" } def date = new Date() diff --git a/jenkins/jobs/integration_tests.pipeline b/jenkins/jobs/integration_tests.pipeline index 672ddabf..47e01e91 100644 --- a/jenkins/jobs/integration_tests.pipeline +++ b/jenkins/jobs/integration_tests.pipeline @@ -20,8 +20,8 @@ script { ci_git_branch="${ghprbActualCommit}" ci_git_url = "${ghprbAuthorRepoGitUrl}" } else { - echo "Checkout ${ghprbAuthorRepoGitUrl} master" - ci_git_branch = "master" + echo "Checkout ${ghprbAuthorRepoGitUrl} main" + ci_git_branch = "main" ci_git_url = "https://github.com/metal3-io/project-infra.git" } def date = new Date() diff --git a/jenkins/jobs/integration_tests_clean.pipeline b/jenkins/jobs/integration_tests_clean.pipeline index 83ab889d..8e89ccf6 100644 --- a/jenkins/jobs/integration_tests_clean.pipeline +++ b/jenkins/jobs/integration_tests_clean.pipeline @@ -9,8 +9,8 @@ script { ci_git_branch="${ghprbActualCommit}" ci_git_url = "${ghprbAuthorRepoGitUrl}" } else { - echo "Checkout ${ghprbAuthorRepoGitUrl} master" - ci_git_branch = "master" + echo "Checkout ${ghprbAuthorRepoGitUrl} main" + ci_git_branch = "main" ci_git_url = "https://github.com/metal3-io/project-infra.git" } }