[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible: DRY

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
29da3984 by Mattia Rizzolo at 2018-05-19T18:06:31+02:00
reproducible: DRY

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
d19873f1 by Mattia Rizzolo at 2018-05-19T18:08:23+02:00
reproducible: add job to sync our repo full of big files, so we can then serve in the website

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


2 changed files:

- + bin/reproducible_sync_lfs.sh
- job-cfg/reproducible.yaml


Changes:

=====================================
bin/reproducible_sync_lfs.sh
=====================================
--- /dev/null
+++ b/bin/reproducible_sync_lfs.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -eux
+
+base=/srv/reproducible-builds.org
+
+cd "$base"
+if [ ! -d lfs ]; then
+    # GIT_URL comes from Jenkins
+    git clone "$GIT_URL" lfs
+    cd lfs
+    git lfs install
+fi
+git pull
+git lfs pull


=====================================
job-cfg/reproducible.yaml
=====================================
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -2,6 +2,7 @@
     name: reproducible
     project-type: freestyle
     my_disabled:
+    my_gitbranches: '*/master'  # j-j-b default
     disabled: '{obj:my_disabled}'
     properties: &sidebar
       - sidebar: &sb1
@@ -711,7 +712,6 @@
                 - 'reprotest_from_git_master':
                     my_description: 'Build reprotest Debian package from git branch master.'
                     my_timed: '42 23 1 1 *'
-                    my_hname: ''
                     my_gitrepo: 'https://salsa.debian.org/reproducible-builds/reprotest.git'
                     my_gitbranches: 'origin/master'
                     my_shell: '/srv/jenkins/bin/chroot-run.sh sid debuild -uc -us'
@@ -719,7 +719,6 @@
                 - 'strip-nondeterminism_from_git_master':
                     my_description: 'Build strip-nondeterminism Debian package from git branch master.'
                     my_timed: '42 23 1 1 *'
-                    my_hname: ''
                     my_gitrepo: 'https://salsa.debian.org/reproducible/strip-nondeterminism.git'
                     my_gitbranches: 'origin/master'
                     my_shell: '/srv/jenkins/bin/chroot-run.sh sid gbp buildpackage -uc -us --git-upstream-branch=master'
@@ -727,7 +726,6 @@
                 - 'disorderfs_from_git_master':
                     my_description: 'Build disorderfs Debian package from git branch master.'
                     my_timed: '42 23 1 1 *'
-                    my_hname: ''
                     my_gitrepo: 'https://salsa.debian.org/reproducible-builds/disorderfs.git'
                     my_gitbranches: 'origin/master'
                     my_shell: '/srv/jenkins/bin/chroot-run.sh sid gbp buildpackage -uc -us --git-upstream-branch=master'
@@ -735,20 +733,21 @@
                 - 'builds_website':
                     my_description: 'Build https://reproducible-builds.org on every git commit to https://salsa.debian.org/reproducible-builds/reproducible-website.git with jekyll.'
                     my_timed: ''
-                    my_hname: ''
                     my_gitrepo: 'https://salsa.debian.org/reproducible-builds/reproducible-website.git'
                     my_gitbranches: 'origin/master'
                     my_shell: 'jekyll build -s . -d /srv/reproducible-builds.org/www'
                 - 'builds_diffoscope_website':
                     my_description: 'Build https://diffoscope.org/ on every git commit to https://salsa.debian.org/reproducible-builds/diffoscope-website.git'
                     my_timed: ''
-                    my_hname: ''
                     my_gitrepo: 'https://salsa.debian.org/reproducible-builds/diffoscope-website.git'
                     my_gitbranches: 'origin/master'
                     my_shell: 'mkdir -pv /srv/diffoscope.org/www && jekyll build -s . -d /srv/diffoscope.org/www'
-            my_gitbranches: 'master'
+                - 'sync_lfs_files':
+                    my_description: 'Pull big files from https://salsa.debian.org/reproducible-builds/reproducible-lfs so we can serve them from here'
+                    my_timed: ''
+                    my_gitrepo: 'https://salsa.debian.org/reproducible-builds/reproducible-lfs.git'
+                    my_shell: '/srv/jenkins/bin/reproducible_sync_lfs.sh'
             my_recipients: 'jenkins+debian-reproducible jenkins+reproducible-builds qa-jenkins-scm at lists.alioth.debian.org'
-            my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
             my_parse_rules: '/srv/jenkins/logparse/reproducible-extra.rules'
             my_hname: ''
             my_naginator_regex: 'Caused by: hudson.plugins.git.GitException: Command "git fetch'



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/3a4cc153a885be46e7615c85250fd1e176c564ef...d19873f1d2f8b5127059a1724857b66c2e220f5f

---
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/3a4cc153a885be46e7615c85250fd1e176c564ef...d19873f1d2f8b5127059a1724857b66c2e220f5f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20180519/33822467/attachment-0001.html>