While the repository was initially intended to only store the
Jenkins-level job definitions, its scope has since been expanded
by adding tools to manage the guests such jobs will ultimately
be executed on; in fact, the latter currently takes up almost
ten times as many lines of code as the former.
Given that, it makes sense to move all Jenkins-related files to
their own top-level directory and make the repository structure
tidier.
This also allows us to make the jenkins-jobs command lines
nicer, as we no longer need to be careful in preventing it from
picking up unrelated files.
Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
README.markdown => jenkins/README.markdown | 16 ++++++----------
{jobs => jenkins/jobs}/autotools.yaml | 0
{jobs => jenkins/jobs}/defaults.yaml | 0
{jobs => jenkins/jobs}/generic.yaml | 0
{jobs => jenkins/jobs}/go.yaml | 0
{jobs => jenkins/jobs}/perl-modulebuild.yaml | 0
{jobs => jenkins/jobs}/python-distutils.yaml | 0
.../projects}/libosinfo+mingw32.yaml | 0
.../projects}/libosinfo+mingw64.yaml | 0
{projects => jenkins/projects}/libosinfo.yaml | 0
.../projects}/libvirt+mingw32.yaml | 0
.../projects}/libvirt+mingw64.yaml | 0
{projects => jenkins/projects}/libvirt-cim.yaml | 0
{projects => jenkins/projects}/libvirt-dbus.yaml | 0
.../projects}/libvirt-glib+mingw32.yaml | 0
.../projects}/libvirt-glib+mingw64.yaml | 0
{projects => jenkins/projects}/libvirt-glib.yaml | 0
.../projects}/libvirt-go-xml.yaml | 0
{projects => jenkins/projects}/libvirt-go.yaml | 0
.../projects}/libvirt-ocaml.yaml | 0
{projects => jenkins/projects}/libvirt-perl.yaml | 0
.../projects}/libvirt-python.yaml | 0
.../projects}/libvirt-sandbox.yaml | 0
{projects => jenkins/projects}/libvirt-tck.yaml | 0
{projects => jenkins/projects}/libvirt.yaml | 0
.../projects}/osinfo-db-tools+mingw32.yaml | 0
.../projects}/osinfo-db-tools+mingw64.yaml | 0
.../projects}/osinfo-db-tools.yaml | 0
{projects => jenkins/projects}/osinfo-db.yaml | 0
{projects => jenkins/projects}/virt-manager.yaml | 0
.../projects}/virt-viewer+mingw32.yaml | 0
.../projects}/virt-viewer+mingw64.yaml | 0
{projects => jenkins/projects}/virt-viewer.yaml | 0
33 files changed, 6 insertions(+), 10 deletions(-)
rename README.markdown => jenkins/README.markdown (69%)
rename {jobs => jenkins/jobs}/autotools.yaml (100%)
rename {jobs => jenkins/jobs}/defaults.yaml (100%)
rename {jobs => jenkins/jobs}/generic.yaml (100%)
rename {jobs => jenkins/jobs}/go.yaml (100%)
rename {jobs => jenkins/jobs}/perl-modulebuild.yaml (100%)
rename {jobs => jenkins/jobs}/python-distutils.yaml (100%)
rename {projects => jenkins/projects}/libosinfo+mingw32.yaml (100%)
rename {projects => jenkins/projects}/libosinfo+mingw64.yaml (100%)
rename {projects => jenkins/projects}/libosinfo.yaml (100%)
rename {projects => jenkins/projects}/libvirt+mingw32.yaml (100%)
rename {projects => jenkins/projects}/libvirt+mingw64.yaml (100%)
rename {projects => jenkins/projects}/libvirt-cim.yaml (100%)
rename {projects => jenkins/projects}/libvirt-dbus.yaml (100%)
rename {projects => jenkins/projects}/libvirt-glib+mingw32.yaml (100%)
rename {projects => jenkins/projects}/libvirt-glib+mingw64.yaml (100%)
rename {projects => jenkins/projects}/libvirt-glib.yaml (100%)
rename {projects => jenkins/projects}/libvirt-go-xml.yaml (100%)
rename {projects => jenkins/projects}/libvirt-go.yaml (100%)
rename {projects => jenkins/projects}/libvirt-ocaml.yaml (100%)
rename {projects => jenkins/projects}/libvirt-perl.yaml (100%)
rename {projects => jenkins/projects}/libvirt-python.yaml (100%)
rename {projects => jenkins/projects}/libvirt-sandbox.yaml (100%)
rename {projects => jenkins/projects}/libvirt-tck.yaml (100%)
rename {projects => jenkins/projects}/libvirt.yaml (100%)
rename {projects => jenkins/projects}/osinfo-db-tools+mingw32.yaml (100%)
rename {projects => jenkins/projects}/osinfo-db-tools+mingw64.yaml (100%)
rename {projects => jenkins/projects}/osinfo-db-tools.yaml (100%)
rename {projects => jenkins/projects}/osinfo-db.yaml (100%)
rename {projects => jenkins/projects}/virt-manager.yaml (100%)
rename {projects => jenkins/projects}/virt-viewer+mingw32.yaml (100%)
rename {projects => jenkins/projects}/virt-viewer+mingw64.yaml (100%)
rename {projects => jenkins/projects}/virt-viewer.yaml (100%)
diff --git a/README.markdown b/jenkins/README.markdown
similarity index 69%
rename from README.markdown
rename to jenkins/README.markdown
index 391b970..703178d 100644
--- a/README.markdown
+++ b/jenkins/README.markdown
@@ -1,7 +1,7 @@
-Libvirt Jenkins CI
-==================
+libvirt CI - Jenkins configuration
+==================================
-This repository contains jobs definitions for the libvirt Jenkins CI.
+This directory contains jobs definitions for the libvirt Jenkins CI.
They're supposed to be fed to the Jenkins Job Builder tool, which can
be installed either through your distribution's package manager, for
@@ -22,11 +22,11 @@ activates the desired jobs and configures them if needed.
It's possible to see the raw Jenkins configuration using either:
- $ jenkins-jobs test -x .git -x guests -r .
+ $ jenkins-jobs test -r .
to see al jobs, or:
- $ jenkins-jobs test -x .git -x guests -r . libvirt-master-build
+ $ jenkins-jobs test -r . libvirt-master-build
if you're interested in a single job.
@@ -41,8 +41,4 @@ going to need a configuration file containing access information:
To update the Jenkins server with all jobs, run:
- $ jenkins-jobs --conf jenkins.ini update -x .git -x guests -r .
-
-The `guests/` directory contains tools used to manage the CI guests
-rather than the Jenkins server; they are documented separately in
-`guests/README.markdown`.
+ $ jenkins-jobs --conf jenkins.ini update -r .
diff --git a/jobs/autotools.yaml b/jenkins/jobs/autotools.yaml
similarity index 100%
rename from jobs/autotools.yaml
rename to jenkins/jobs/autotools.yaml
diff --git a/jobs/defaults.yaml b/jenkins/jobs/defaults.yaml
similarity index 100%
rename from jobs/defaults.yaml
rename to jenkins/jobs/defaults.yaml
diff --git a/jobs/generic.yaml b/jenkins/jobs/generic.yaml
similarity index 100%
rename from jobs/generic.yaml
rename to jenkins/jobs/generic.yaml
diff --git a/jobs/go.yaml b/jenkins/jobs/go.yaml
similarity index 100%
rename from jobs/go.yaml
rename to jenkins/jobs/go.yaml
diff --git a/jobs/perl-modulebuild.yaml b/jenkins/jobs/perl-modulebuild.yaml
similarity index 100%
rename from jobs/perl-modulebuild.yaml
rename to jenkins/jobs/perl-modulebuild.yaml
diff --git a/jobs/python-distutils.yaml b/jenkins/jobs/python-distutils.yaml
similarity index 100%
rename from jobs/python-distutils.yaml
rename to jenkins/jobs/python-distutils.yaml
diff --git a/projects/libosinfo+mingw32.yaml b/jenkins/projects/libosinfo+mingw32.yaml
similarity index 100%
rename from projects/libosinfo+mingw32.yaml
rename to jenkins/projects/libosinfo+mingw32.yaml
diff --git a/projects/libosinfo+mingw64.yaml b/jenkins/projects/libosinfo+mingw64.yaml
similarity index 100%
rename from projects/libosinfo+mingw64.yaml
rename to jenkins/projects/libosinfo+mingw64.yaml
diff --git a/projects/libosinfo.yaml b/jenkins/projects/libosinfo.yaml
similarity index 100%
rename from projects/libosinfo.yaml
rename to jenkins/projects/libosinfo.yaml
diff --git a/projects/libvirt+mingw32.yaml b/jenkins/projects/libvirt+mingw32.yaml
similarity index 100%
rename from projects/libvirt+mingw32.yaml
rename to jenkins/projects/libvirt+mingw32.yaml
diff --git a/projects/libvirt+mingw64.yaml b/jenkins/projects/libvirt+mingw64.yaml
similarity index 100%
rename from projects/libvirt+mingw64.yaml
rename to jenkins/projects/libvirt+mingw64.yaml
diff --git a/projects/libvirt-cim.yaml b/jenkins/projects/libvirt-cim.yaml
similarity index 100%
rename from projects/libvirt-cim.yaml
rename to jenkins/projects/libvirt-cim.yaml
diff --git a/projects/libvirt-dbus.yaml b/jenkins/projects/libvirt-dbus.yaml
similarity index 100%
rename from projects/libvirt-dbus.yaml
rename to jenkins/projects/libvirt-dbus.yaml
diff --git a/projects/libvirt-glib+mingw32.yaml b/jenkins/projects/libvirt-glib+mingw32.yaml
similarity index 100%
rename from projects/libvirt-glib+mingw32.yaml
rename to jenkins/projects/libvirt-glib+mingw32.yaml
diff --git a/projects/libvirt-glib+mingw64.yaml b/jenkins/projects/libvirt-glib+mingw64.yaml
similarity index 100%
rename from projects/libvirt-glib+mingw64.yaml
rename to jenkins/projects/libvirt-glib+mingw64.yaml
diff --git a/projects/libvirt-glib.yaml b/jenkins/projects/libvirt-glib.yaml
similarity index 100%
rename from projects/libvirt-glib.yaml
rename to jenkins/projects/libvirt-glib.yaml
diff --git a/projects/libvirt-go-xml.yaml b/jenkins/projects/libvirt-go-xml.yaml
similarity index 100%
rename from projects/libvirt-go-xml.yaml
rename to jenkins/projects/libvirt-go-xml.yaml
diff --git a/projects/libvirt-go.yaml b/jenkins/projects/libvirt-go.yaml
similarity index 100%
rename from projects/libvirt-go.yaml
rename to jenkins/projects/libvirt-go.yaml
diff --git a/projects/libvirt-ocaml.yaml b/jenkins/projects/libvirt-ocaml.yaml
similarity index 100%
rename from projects/libvirt-ocaml.yaml
rename to jenkins/projects/libvirt-ocaml.yaml
diff --git a/projects/libvirt-perl.yaml b/jenkins/projects/libvirt-perl.yaml
similarity index 100%
rename from projects/libvirt-perl.yaml
rename to jenkins/projects/libvirt-perl.yaml
diff --git a/projects/libvirt-python.yaml b/jenkins/projects/libvirt-python.yaml
similarity index 100%
rename from projects/libvirt-python.yaml
rename to jenkins/projects/libvirt-python.yaml
diff --git a/projects/libvirt-sandbox.yaml b/jenkins/projects/libvirt-sandbox.yaml
similarity index 100%
rename from projects/libvirt-sandbox.yaml
rename to jenkins/projects/libvirt-sandbox.yaml
diff --git a/projects/libvirt-tck.yaml b/jenkins/projects/libvirt-tck.yaml
similarity index 100%
rename from projects/libvirt-tck.yaml
rename to jenkins/projects/libvirt-tck.yaml
diff --git a/projects/libvirt.yaml b/jenkins/projects/libvirt.yaml
similarity index 100%
rename from projects/libvirt.yaml
rename to jenkins/projects/libvirt.yaml
diff --git a/projects/osinfo-db-tools+mingw32.yaml b/jenkins/projects/osinfo-db-tools+mingw32.yaml
similarity index 100%
rename from projects/osinfo-db-tools+mingw32.yaml
rename to jenkins/projects/osinfo-db-tools+mingw32.yaml
diff --git a/projects/osinfo-db-tools+mingw64.yaml b/jenkins/projects/osinfo-db-tools+mingw64.yaml
similarity index 100%
rename from projects/osinfo-db-tools+mingw64.yaml
rename to jenkins/projects/osinfo-db-tools+mingw64.yaml
diff --git a/projects/osinfo-db-tools.yaml b/jenkins/projects/osinfo-db-tools.yaml
similarity index 100%
rename from projects/osinfo-db-tools.yaml
rename to jenkins/projects/osinfo-db-tools.yaml
diff --git a/projects/osinfo-db.yaml b/jenkins/projects/osinfo-db.yaml
similarity index 100%
rename from projects/osinfo-db.yaml
rename to jenkins/projects/osinfo-db.yaml
diff --git a/projects/virt-manager.yaml b/jenkins/projects/virt-manager.yaml
similarity index 100%
rename from projects/virt-manager.yaml
rename to jenkins/projects/virt-manager.yaml
diff --git a/projects/virt-viewer+mingw32.yaml b/jenkins/projects/virt-viewer+mingw32.yaml
similarity index 100%
rename from projects/virt-viewer+mingw32.yaml
rename to jenkins/projects/virt-viewer+mingw32.yaml
diff --git a/projects/virt-viewer+mingw64.yaml b/jenkins/projects/virt-viewer+mingw64.yaml
similarity index 100%
rename from projects/virt-viewer+mingw64.yaml
rename to jenkins/projects/virt-viewer+mingw64.yaml
diff --git a/projects/virt-viewer.yaml b/jenkins/projects/virt-viewer.yaml
similarity index 100%
rename from projects/virt-viewer.yaml
rename to jenkins/projects/virt-viewer.yaml
--
2.20.1
