diff options
| -rwxr-xr-x | bin/jenkins_node_wrapper.sh | 2 | ||||
| -rw-r--r-- | hosts/profitbricks-build3-amd64/etc/mock/fedora-23-x86_64.cfg | 61 | ||||
| -rw-r--r-- | job-cfg/reproducible.yaml | 12 |
3 files changed, 68 insertions, 7 deletions
diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh index ccd1645a..a490f638 100755 --- a/bin/jenkins_node_wrapper.sh +++ b/bin/jenkins_node_wrapper.sh @@ -105,7 +105,7 @@ elif [[ "$*" =~ reproducible_freebsd ]] ; then exec /srv/jenkins/bin/reproducible_freebsd.sh ; croak "Exec failed"; elif [[ "$*" =~ reproducible_setup_schroot_archlinux ]] ; then exec /srv/jenkins/bin/reproducible_setup_archlinux_schroot.sh ; croak "Exec failed"; -elif [[ "$*" =~ reproducible_setup_mock_fedora23_x86_64 ]] ; then +elif [[ "$*" =~ reproducible_setup_mock_fedora-23_x86_64 ]] ; then exec /srv/jenkins/bin/reproducible_setup_mock.sh fedora-23 x86_64 ; croak "Exec failed"; elif [ "$1" = "/srv/jenkins/bin/reproducible_build_archlinux_pkg.sh" ] && ( [ "$2" = "1" ] || [ "$2" = "2" ] ) ; then exec /srv/jenkins/bin/reproducible_build_archlinux_pkg.sh "$2" "$3" "$4" "$5" ; croak "Exec failed"; diff --git a/hosts/profitbricks-build3-amd64/etc/mock/fedora-23-x86_64.cfg b/hosts/profitbricks-build3-amd64/etc/mock/fedora-23-x86_64.cfg new file mode 100644 index 00000000..c05a8452 --- /dev/null +++ b/hosts/profitbricks-build3-amd64/etc/mock/fedora-23-x86_64.cfg @@ -0,0 +1,61 @@ +config_opts['root'] = 'fedora-23-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc23' # only useful for --resultdir variable subst + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-23&arch=x86_64 +failovermethod=priority + +[updates] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f23&arch=x86_64 +failovermethod=priority + +[updates-testing] +name=updates-testing +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f23&arch=x86_64 +failovermethod=priority +enabled=0 + +[local] +name=local +baseurl=http://kojipkgs.fedoraproject.org/repos/f23-build/latest/x86_64/ +cost=2000 +enabled=0 + +[fedora-debuginfo] +name=fedora-debuginfo +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-23&arch=x86_64 +failovermethod=priority +enabled=0 + +[updates-debuginfo] +name=updates-debuginfo +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f23&arch=x86_64 +failovermethod=priority +enabled=0 + +[updates-testing-debuginfo] +name=updates-testing-debuginfo +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f23&arch=x86_64 +failovermethod=priority +enabled=0 +""" diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index b59602da..2d518821 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -763,7 +763,7 @@ - job-template: defaults: reproducible_other_projects - name: '{name}_setup_mock_fedora23_x86_64' + name: '{name}_setup_mock_fedora-23_x86_64' - job-template: defaults: reproducible_builder_trigger @@ -775,7 +775,7 @@ - job-template: defaults: reproducible_builder_trigger - name: '{name}_builder_fedora23_x86_64_1' + name: '{name}_builder_fedora-23_x86_64_1' - job-template: defaults: reproducible @@ -1539,8 +1539,8 @@ my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: 'profitbricks3' - - '{name}_setup_mock_fedora23_x86_64': - my_description: 'Setup mock for fedora23 on X86_64 to test .rpm packages for reproducibility.' + - '{name}_setup_mock_fedora-23_x86_64': + my_description: 'Setup mock for fedora-23 on X86_64 to test .rpm packages for reproducibility.' my_timed: '42 23 1 1 *' my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' @@ -1559,11 +1559,11 @@ my_shell: '/srv/jenkins/bin/reproducible_build_archlinux_pkg.sh' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: '' - - '{name}_builder_fedora23_x86_64_1': + - '{name}_builder_fedora-23_x86_64_1': my_description: 'Try to reproducibly build a Fedora 23 package.' my_timed: '* * * * *' my_trigger: '' - my_shell: '/srv/jenkins/bin/reproducible_build_rpm.sh fedora23 x86_64' + my_shell: '/srv/jenkins/bin/reproducible_build_rpm.sh fedora-23 x86_64' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: '' - '{name}_html_archlinux': |