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

Switch to main in project-infra references #297

Merged
merged 1 commit into from
Dec 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions jenkins/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions jenkins/jobs/bml_integration_tests.pipeline
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions jenkins/jobs/integration_tests.pipeline
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions jenkins/jobs/integration_tests_clean.pipeline
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down