Skip to content

Commit

Permalink
Merge pull request #682 from askb/master
Browse files Browse the repository at this point in the history
CI: Set github-org as project param
  • Loading branch information
Eric Ball authored Aug 30, 2023
2 parents 508b764 + f7fc43a commit db8bb19
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 22 deletions.
2 changes: 2 additions & 0 deletions jjb/ci-management/ci-management.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
project-name: ci-management
build-node: centos7-builder-2c-1g
build-timeout: 20
github-org: edgexfoundry

- project:
name: builder-openstack
Expand All @@ -22,6 +23,7 @@
project: ci-management
project-name: ci-management
build-node: centos7-builder-2c-1g
github-org: edgexfoundry

jenkins-urls: >
https://jenkins.edgexfoundry.org
Expand Down
2 changes: 2 additions & 0 deletions jjb/ci-management/packer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
project-name: ci-management
branch: master
archive-artifacts: '**/*.log'
github-org: edgexfoundry

build-node: centos7-builder-2c-1g
build-timeout: 90
Expand All @@ -27,6 +28,7 @@
project-name: ci-management
branch: master
archive-artifacts: '**/*.log'
github-org: edgexfoundry

build-node: centos7-builder-2c-1g
build-timeout: 90
Expand Down
1 change: 1 addition & 0 deletions jjb/device/device-grove-c-snap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
project-name: device-grove-c-snap
project: device-grove-c
mvn-settings: device-grove-c-settings
github-org: edgexfoundry
stream:
- 'master':
branch: 'master'
Expand Down
1 change: 1 addition & 0 deletions jjb/edgex-go/edgex-go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
project-name: edgex-go-snap
project: edgex-go
mvn-settings: edgex-go-settings
github-org: edgexfoundry
stream:
- 'master':
branch: 'master'
Expand Down
6 changes: 3 additions & 3 deletions jjb/edgex-templates-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
###########
# ANCHORS #
###########
- docker_job_boiler_plate: &docker_job_boiler_plate
- _docker_job_boiler_plate: &docker_job_boiler_plate
name: docker_job-boiler-plate

project-type: freestyle
Expand Down Expand Up @@ -51,7 +51,7 @@
publishers:
- edgex-infra-publish

- docker_verify_boiler_plate: &docker_verify_boiler_plate
- _docker_verify_boiler_plate: &docker_verify_boiler_plate
name: docker_verify_boiler_plate

concurrent: true
Expand Down Expand Up @@ -79,7 +79,7 @@
- '{branch}'


- docker_merge_boiler_plate: &docker_merge_boiler_plate
- _docker_merge_boiler_plate: &docker_merge_boiler_plate
name: docker_merge_boiler_plate

scm:
Expand Down
6 changes: 3 additions & 3 deletions jjb/edgex-templates-docs.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# Job definition Anchors
- docs_job_boiler_plate: &docs_job_boiler_plate
- _docs_job_boiler_plate: &docs_job_boiler_plate
name: docs_job-boiler-plate

project-type: freestyle
Expand Down Expand Up @@ -49,7 +49,7 @@
- edgex-infra-publish
- edgex-jenkins-alerts

- docs_verify_boiler_plate: &docs_verify_boiler_plate
- _docs_verify_boiler_plate: &docs_verify_boiler_plate
name: docs_verify_boiler_plate

concurrent: true
Expand All @@ -76,7 +76,7 @@
white-list-target-branches:
- '{branch}'

- docs_merge_boiler_plate: &docs_merge_boiler_plate
- _docs_merge_boiler_plate: &docs_merge_boiler_plate
name: docs_merge_boiler_plate

scm:
Expand Down
6 changes: 3 additions & 3 deletions jjb/edgex-templates-go.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# Job definition Anchors
- go_job_boiler_plate: &go_job_boiler_plate
- _go_job_boiler_plate: &go_job_boiler_plate
name: go_job-boiler-plate

project-type: freestyle
Expand Down Expand Up @@ -53,7 +53,7 @@
- edgex-infra-publish
- edgex-jenkins-alerts

- go_verify_boiler_plate: &go_verify_boiler_plate
- _go_verify_boiler_plate: &go_verify_boiler_plate
name: go_verify_boiler_plate

concurrent: true
Expand Down Expand Up @@ -81,7 +81,7 @@
- '{branch}'


- go_merge_boiler_plate: &go_merge_boiler_plate
- _go_merge_boiler_plate: &go_merge_boiler_plate
name: go_merge_boiler_plate

scm:
Expand Down
6 changes: 3 additions & 3 deletions jjb/edgex-templates-java.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# Job definition Anchors
- job_boiler_plate: &job_boiler_plate
- _job_boiler_plate: &job_boiler_plate
name: job-boiler-plate

project-type: freestyle
Expand Down Expand Up @@ -39,7 +39,7 @@
publishers:
- edgex-infra-publish

- verify_boiler_plate: &verify_boiler_plate
- _verify_boiler_plate: &verify_boiler_plate
name: verify_boiler_plate

concurrent: true
Expand Down Expand Up @@ -67,7 +67,7 @@
- '{branch}'


- merge_boiler_plate: &merge_boiler_plate
- _merge_boiler_plate: &merge_boiler_plate
name: merge_boiler_plate

scm:
Expand Down
6 changes: 3 additions & 3 deletions jjb/edgex-templates-performance.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# Job definition Anchors
- performance_job_boiler_plate: &performance_job_boiler_plate
- _performance_job_boiler_plate: &performance_job_boiler_plate
name: performance_job-boiler-plate

project-type: pipeline
Expand Down Expand Up @@ -72,7 +72,7 @@
description: |
Trigger JMeter script, can't be empty
- performance_verify_boiler_plate: &performance_verify_boiler_plate
- _performance_verify_boiler_plate: &performance_verify_boiler_plate
name: performance_verify_boiler_plate

scm:
Expand All @@ -86,7 +86,7 @@
submodule-disable: false
submodule-timeout: 10

- performance_test_boiler_plate: &performance_test_boiler_plate
- _performance_test_boiler_plate: &performance_test_boiler_plate
name: performance_test_boiler_plate

scm:
Expand Down
8 changes: 4 additions & 4 deletions jjb/edgex-templates-pipeline.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# Job definition Anchors
- pipeline_job_boiler_plate: &pipeline_job_boiler_plate
- _pipeline_job_boiler_plate: &pipeline_job_boiler_plate
name: pipeline_job_boiler_plate

project-type: pipeline
Expand Down Expand Up @@ -47,7 +47,7 @@

publishers: {}

- pipeline_verify_boiler_plate: &pipeline_verify_boiler_plate
- _pipeline_verify_boiler_plate: &pipeline_verify_boiler_plate
name: pipeline_verify_boiler_plate
pipeline-scm:
script-path: '{jenkins_file}'
Expand Down Expand Up @@ -77,7 +77,7 @@
- '{branch}'


- pipeline_merge_boiler_plate: &pipeline_merge_boiler_plate
- _pipeline_merge_boiler_plate: &pipeline_merge_boiler_plate
name: pipeline_merge_boiler_plate
pipeline-scm:
script-path: '{jenkins_file}'
Expand All @@ -99,7 +99,7 @@
# no reason to add github-pull-request here since it doesn't currently
# work for merge / push

- pipeline_webhooks_boiler_plate: &pipeline_webhooks_boiler_plate
- _pipeline_webhooks_boiler_plate: &pipeline_webhooks_boiler_plate
# Freestyle job to have jenkins create and maintain the github push
# webhook. Currently the github jenkins plugin cannot create the push
# webhook using the pipeline scm section of the job.
Expand Down
6 changes: 3 additions & 3 deletions jjb/edgex-templates-snap.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# Job definition Anchors
- snap_job_boiler_plate: &snap_job_boiler_plate
- _snap_job_boiler_plate: &snap_job_boiler_plate
name: snap_job-boiler-plate

project-type: freestyle
Expand Down Expand Up @@ -51,7 +51,7 @@
- edgex-infra-publish
- edgex-jenkins-alerts

- snap_verify_boiler_plate: &snap_verify_boiler_plate
- _snap_verify_boiler_plate: &snap_verify_boiler_plate
name: snap_verify_boiler_plate

concurrent: true
Expand All @@ -67,7 +67,7 @@
submodule-disable: false
submodule-timeout: 10

- snap_merge_boiler_plate: &snap_merge_boiler_plate
- _snap_merge_boiler_plate: &snap_merge_boiler_plate
name: snap_merge_boiler_plate

scm:
Expand Down
1 change: 1 addition & 0 deletions jjb/performance-test/performance-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
mvn-settings: performance-test-settings
build-timeout: 30
jenkins_file: 'Jenkinsfile'
github-org: edgexfoundry
stream:
- 'master':
branch: 'master'
Expand Down
1 change: 1 addition & 0 deletions jjb/ui/edgex-ui-go-snap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
project-name: edgex-ui-go-snap
project: edgex-ui-go
mvn-settings: edgex-ui-go-settings
github-org: edgexfoundry
stream:
- 'master':
branch: 'master'
Expand Down

0 comments on commit db8bb19

Please sign in to comment.