diff options
Diffstat (limited to 'job-cfg')
| -rwxr-xr-x | job-cfg/d-i.yaml.py | 12 | ||||
| -rw-r--r-- | job-cfg/lvc.yaml | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/job-cfg/d-i.yaml.py b/job-cfg/d-i.yaml.py index d6ae55e1..b9065474 100755 --- a/job-cfg/d-i.yaml.py +++ b/job-cfg/d-i.yaml.py @@ -369,12 +369,12 @@ data.extend( 'branches': ['{branch}']}}], 'builders': [{'shell': '/srv/jenkins/bin/d-i_build.sh'}, {'trigger-builds': [{'project': 'lvc_debian-miniiso', - 'predefined-parameters': 'PU_GIT_BRANCH=$PU_GIT_BRANCH' + 'current-parameters': 'true', }]}], 'project-type': 'freestyle', 'properties': prop(type='packages', priority=99), - 'parameters': [{'string': {'name': 'PU_GIT_BRANCH', - 'description': 'git branch that triggered the build that resulted in this subsequent build.'}}], + 'parameters': [{'string': {'name': 'TRIGGERING_BRANCH', + 'description': 'git branch that triggered the build that resulted in this subsequent build.'}}], 'logrotate': lr(90), 'publishers': publ(irc='debian-boot')}}]) @@ -388,16 +388,14 @@ data.extend( 'scm': [{'git': {'url': '{gitrepo}', 'branches': ['{branch}']}}], 'builders': [ {'shell': '/srv/jenkins/bin/d-i_build.sh'}, + {'inject': {'properties-file': 'env.txt'}}, {'trigger-builds': [{'project': 'd-i_pu-triggered_debian-installer', - 'current-parameters': 'true', - 'predefined-parameters': 'PU_GIT_BRANCH=$GIT_BRANCH' + 'predefined-parameters': 'TRIGGERING_BRANCH=$OUR_BRANCH' }, ]} ], 'project-type': 'freestyle', 'properties': prop(type='packages', priority=99), - 'parameters': [{'string': {'name': 'GIT_BRANCH', - 'description': 'git branch to pretend to have triggered a by-hand build.'}}], 'logrotate': lr(90), 'publishers': publ(irc='debian-boot')}}]) diff --git a/job-cfg/lvc.yaml b/job-cfg/lvc.yaml index 78916dae..1e4b2846 100644 --- a/job-cfg/lvc.yaml +++ b/job-cfg/lvc.yaml @@ -24,7 +24,7 @@ - lvc parameters: - string: - name: PU_GIT_BRANCH + name: TRIGGERING_BRANCH description: The git branch that triggered the build that reulted in this subsequent build logrotate: daysToKeep: 90 @@ -107,7 +107,7 @@ my_time: 'H */8 * * *' - 'debian-miniiso': dist_name: 'Debian-Installer local mini.iso' - my_iso: 'use_PU_GIT_BRANCH' + my_iso: 'use_TRIGGERING_BRANCH' - 'debian-testing-daily-broken': dist_name: 'Debian-Installer Testing (Daily) -- Broken Scenarios' my_iso: 'http://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso' |