David Caro has uploaded a new change for review.
Change subject: Adding the host-deploy create-rpm jobs
......................................................................
Adding the host-deploy create-rpm jobs
Change-Id: I6645df8e888856f3e39834f35f0ecd7f12c1661c
Signed-off-by: David Caro <dcaro...@redhat.com>
---
M jobs/confs/shell-scripts/build_mock_srcrpm.sh
M jobs/confs/shell-scripts/mock_build_onlyrpm.sh
A jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml
A jobs/confs/yaml/scms/ovirt-host-deploy.yaml
4 files changed, 60 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/34/36034/1
diff --git a/jobs/confs/shell-scripts/build_mock_srcrpm.sh
b/jobs/confs/shell-scripts/build_mock_srcrpm.sh
index 5b9de55..9eebd47 100644
--- a/jobs/confs/shell-scripts/build_mock_srcrpm.sh
+++ b/jobs/confs/shell-scripts/build_mock_srcrpm.sh
@@ -44,7 +44,11 @@
extra_configure_options=({extra-configure-options})
extra_autogen_options=({extra-autogen-options})
extra_rpmbuild_options=({extra-rpmbuild-options})
-extra_build_packages=({extra-build-packages})
+extra_build_packages=(
+ autoconf
+ make
+ {extra-build-packages}
+)
extra_repos=({extra-repos})
extra_env=({extra-env})
WORKSPACE=$PWD
@@ -163,9 +167,15 @@
set -e
cd /tmp/$project
# build tarballs
-./autogen.sh --system "${{extra_autogen_options[@]}}"
+if [[ -e autogen.sh ]]; then
+ ./autogen.sh --system "${{extra_autogen_options[@]}}"
+else
+ autoreconf -ivf
+fi
./configure "${{extra_configure_options[@]}}"
make dist
+echo "Really ugly hack for the host-dpeloy job"
+make offline-tarball || :
# build src.rpm
rpmbuild \
diff --git a/jobs/confs/shell-scripts/mock_build_onlyrpm.sh
b/jobs/confs/shell-scripts/mock_build_onlyrpm.sh
index 8128906..2183f12 100644
--- a/jobs/confs/shell-scripts/mock_build_onlyrpm.sh
+++ b/jobs/confs/shell-scripts/mock_build_onlyrpm.sh
@@ -126,6 +126,7 @@
"${{mock_build_options[@]}}" \
--rebuild \
--no-clean \
+ --no-cleanup-after \
--resultdir=$WORKSPACE/exported-artifacts \
"$srcrpm"
done
diff --git
a/jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml
b/jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml
new file mode 100644
index 0000000..c453223
--- /dev/null
+++ b/jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml
@@ -0,0 +1,31 @@
+- project:
+ name: ovirt-host-deploy_create-rpms
+ project:
+ - ovirt-host-deploy
+ trigger:
+ - merged
+ version:
+ - master:
+ extra-repos: |
+
ovirt-master-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro
+
ovirt-master-snapshot-static,http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/$distro
+ branch: master
+ mock-build-type:
+ - all
+ distro:
+ - el6
+ - el7
+ - fc19
+ - fc20
+ - fc21
+ arch:
+ - x86_64
+ extra-configure-options: |
+ --with-otopi-sources=/dev/null
+ extra-build-packages: |
+ gettext-devel
+ automake
+ autoreconf
+ make
+ jobs:
+ - '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}'
diff --git a/jobs/confs/yaml/scms/ovirt-host-deploy.yaml
b/jobs/confs/yaml/scms/ovirt-host-deploy.yaml
new file mode 100644
index 0000000..e85f7a5
--- /dev/null
+++ b/jobs/confs/yaml/scms/ovirt-host-deploy.yaml
@@ -0,0 +1,16 @@
+- scm:
+ name: ovirt-host-deploy-gerrit
+ scm:
+ - git:
+ url: git://gerrit.ovirt.org/ovirt-host-deploy.git
+ branches:
+ - $GERRIT_BRANCH
+ basedir: ovirt-host-deploy
+ scm-name: ovirt-host-deploy
+ name: ''
+ refspec: $GERRIT_REFSPEC
+ choosing-strategy: gerrit
+ use-author: true
+ skip-tag: true
+ prune: true
+ wipe-workspace: false
--
To view, visit http://gerrit.ovirt.org/36034
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6645df8e888856f3e39834f35f0ecd7f12c1661c
Gerrit-PatchSet: 1
Gerrit-Project: jenkins
Gerrit-Branch: master
Gerrit-Owner: David Caro <dcaro...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
