Stop using Jenkins SCM plug-in
This depends on slave script support and should not be approved until I86c77695d8c374c94932664026ab7a541686ae74 has a chance to appear in all current nodepool images. * macros.yaml: Add a branch-git-prep builder which passes a BRANCH environment variable into the gerrit-git-prep.sh slave script. * python-bitrot-jobs.yaml: Pass the {branch} parameter to the branch-git-prep builder to specify the branch on which to run stable bitrot jobs, instead of using the SCM plug-in. * translation-jobs.yaml * zuul.yaml: Pass master as the branch for the branch-git-prep builder instead of using the SCM plug-in. Change-Id: Ied8b4c111172b654cc90938221690651a5b458df
This commit is contained in:
parent
6d1d321ee0
commit
40c54efd12
@ -3,6 +3,14 @@
|
|||||||
builders:
|
builders:
|
||||||
- shell: "/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org"
|
- shell: "/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org"
|
||||||
|
|
||||||
|
- builder:
|
||||||
|
name: branch-git-prep
|
||||||
|
builders:
|
||||||
|
- shell: |
|
||||||
|
#!/bin/bash
|
||||||
|
export BRANCH={branch}
|
||||||
|
/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org
|
||||||
|
|
||||||
- builder:
|
- builder:
|
||||||
name: revoke-sudo
|
name: revoke-sudo
|
||||||
builders:
|
builders:
|
||||||
|
@ -9,6 +9,8 @@
|
|||||||
|
|
||||||
builders:
|
builders:
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
|
- branch-git-prep:
|
||||||
|
branch: '{branch}'
|
||||||
- python26:
|
- python26:
|
||||||
github-org: '{github-org}'
|
github-org: '{github-org}'
|
||||||
project: '{name}'
|
project: '{name}'
|
||||||
@ -18,12 +20,6 @@
|
|||||||
- test-results
|
- test-results
|
||||||
- console-log
|
- console-log
|
||||||
|
|
||||||
scm:
|
|
||||||
- git:
|
|
||||||
url: 'git://git.openstack.org/{github-org}/{name}'
|
|
||||||
branches:
|
|
||||||
- 'origin/{branch}'
|
|
||||||
|
|
||||||
node: bare-centos6
|
node: bare-centos6
|
||||||
|
|
||||||
|
|
||||||
@ -38,6 +34,8 @@
|
|||||||
|
|
||||||
builders:
|
builders:
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
|
- branch-git-prep:
|
||||||
|
branch: '{branch}'
|
||||||
- python27:
|
- python27:
|
||||||
github-org: '{github-org}'
|
github-org: '{github-org}'
|
||||||
project: '{name}'
|
project: '{name}'
|
||||||
@ -47,12 +45,6 @@
|
|||||||
- test-results
|
- test-results
|
||||||
- console-log
|
- console-log
|
||||||
|
|
||||||
scm:
|
|
||||||
- git:
|
|
||||||
url: 'git://git.openstack.org/{github-org}/{name}'
|
|
||||||
branches:
|
|
||||||
- 'origin/{branch}'
|
|
||||||
|
|
||||||
node: '{node}'
|
node: '{node}'
|
||||||
|
|
||||||
|
|
||||||
@ -67,6 +59,8 @@
|
|||||||
|
|
||||||
builders:
|
builders:
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
|
- branch-git-prep:
|
||||||
|
branch: '{branch}'
|
||||||
- docs:
|
- docs:
|
||||||
github-org: '{github-org}'
|
github-org: '{github-org}'
|
||||||
project: '{name}'
|
project: '{name}'
|
||||||
@ -74,12 +68,6 @@
|
|||||||
publishers:
|
publishers:
|
||||||
- console-log
|
- console-log
|
||||||
|
|
||||||
scm:
|
|
||||||
- git:
|
|
||||||
url: 'git://git.openstack.org/{github-org}/{name}'
|
|
||||||
branches:
|
|
||||||
- 'origin/{branch}'
|
|
||||||
|
|
||||||
node: '{node}'
|
node: '{node}'
|
||||||
|
|
||||||
|
|
||||||
|
@ -18,6 +18,8 @@
|
|||||||
|
|
||||||
builders:
|
builders:
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
|
- branch-git-prep:
|
||||||
|
branch: master
|
||||||
- shell: |
|
- shell: |
|
||||||
#!/bin/bash -xe
|
#!/bin/bash -xe
|
||||||
/usr/local/jenkins/slave_scripts/propose_translation_update.sh {github-org} {name}
|
/usr/local/jenkins/slave_scripts/propose_translation_update.sh {github-org} {name}
|
||||||
@ -25,12 +27,6 @@
|
|||||||
publishers:
|
publishers:
|
||||||
- console-log
|
- console-log
|
||||||
|
|
||||||
scm:
|
|
||||||
- git:
|
|
||||||
url: 'git://git.openstack.org/{github-org}/{name}'
|
|
||||||
branches:
|
|
||||||
- 'origin/master'
|
|
||||||
|
|
||||||
node: 'proposal'
|
node: 'proposal'
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
@ -68,6 +64,8 @@
|
|||||||
|
|
||||||
builders:
|
builders:
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
|
- branch-git-prep:
|
||||||
|
branch: master
|
||||||
- shell: |
|
- shell: |
|
||||||
#!/bin/bash -xe
|
#!/bin/bash -xe
|
||||||
/usr/local/jenkins/slave_scripts/propose_translation_update_manuals.sh {name}
|
/usr/local/jenkins/slave_scripts/propose_translation_update_manuals.sh {name}
|
||||||
@ -75,12 +73,6 @@
|
|||||||
publishers:
|
publishers:
|
||||||
- console-log
|
- console-log
|
||||||
|
|
||||||
scm:
|
|
||||||
- git:
|
|
||||||
url: 'git://git.openstack.org/{github-org}/{name}'
|
|
||||||
branches:
|
|
||||||
- 'origin/master'
|
|
||||||
|
|
||||||
node: 'proposal'
|
node: 'proposal'
|
||||||
|
|
||||||
- job-group:
|
- job-group:
|
||||||
|
@ -45,6 +45,8 @@
|
|||||||
|
|
||||||
builders:
|
builders:
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
|
- branch-git-prep:
|
||||||
|
branch: master
|
||||||
- python27:
|
- python27:
|
||||||
github-org: 'openstack-infra'
|
github-org: 'openstack-infra'
|
||||||
project: 'zuul'
|
project: 'zuul'
|
||||||
@ -53,10 +55,4 @@
|
|||||||
- test-results
|
- test-results
|
||||||
- console-log
|
- console-log
|
||||||
|
|
||||||
scm:
|
|
||||||
- git:
|
|
||||||
url: 'git://git.openstack.org/openstack-infra/zuul'
|
|
||||||
branches:
|
|
||||||
- 'origin/master'
|
|
||||||
|
|
||||||
node: bare-precise
|
node: bare-precise
|
||||||
|
Loading…
Reference in New Issue
Block a user