Ryan Barry has uploaded a new change for review.
Change subject: Build ovirt-node-iso from the latest ovirt-node artifacts
......................................................................
Build ovirt-node-iso from the latest ovirt-node artifacts
Grab the artifacts from the last successful build and push them
into a local repository instead of using what's published on
ovirt.org
Change-Id: Iaec7563815eb0a526190da5a7246590cd95b1364
Signed-off-by: Ryan Barry <rba...@redhat.com>
---
M jobs/confs/shell-scripts/build-local-ovirt-node-iso.sh
M jobs/confs/yaml/builders/ovirt-node-builders.yaml
M jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
3 files changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/11/41611/1
diff --git a/jobs/confs/shell-scripts/build-local-ovirt-node-iso.sh
b/jobs/confs/shell-scripts/build-local-ovirt-node-iso.sh
index 8a4b40c..76f3df8 100755
--- a/jobs/confs/shell-scripts/build-local-ovirt-node-iso.sh
+++ b/jobs/confs/shell-scripts/build-local-ovirt-node-iso.sh
@@ -17,6 +17,7 @@
export OVIRT_NODE_BASE="$PWD"
export OVIRT_CACHE_DIR="$CACHE/$DISTRO"
export PATH=$PATH:/usr/sbin
+ export OVIRT_LOCAL_REPO="file://$OVIRT_CACHE_DIR/ovirt-node"
}}
@@ -46,6 +47,13 @@
fi
}}
+function create_repo {{
+ pushd .
+ cd $OVIRT_LOCAL_REPO
+ createrepo .
+ popd
+}}
+
function clean_iso {{
pushd .
local clean_failed=false
@@ -71,6 +79,7 @@
set_env
check_pre
+create_repo
for dir in exported-artifacts; do
rm -Rf "$dir"
diff --git a/jobs/confs/yaml/builders/ovirt-node-builders.yaml
b/jobs/confs/yaml/builders/ovirt-node-builders.yaml
index bdf5760..16bea2e 100644
--- a/jobs/confs/yaml/builders/ovirt-node-builders.yaml
+++ b/jobs/confs/yaml/builders/ovirt-node-builders.yaml
@@ -4,6 +4,11 @@
- builder:
name: ovirt-node_create-iso
builders :
+ - copyartifact:
+ project: ovirt-node_{version}_create-rpms-{distro}_merged
+ which-build: last-successful
+ filter: "*.rpm"
+ target: build/{distro}/ovirt-node
- shell:
!include-raw shell-scripts/build-local-ovirt-node-iso.sh
- builder:
diff --git a/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
b/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
index e589059..04f356b 100644
--- a/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
+++ b/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
@@ -4,6 +4,7 @@
builders :
- cleanup-slave
- ovirt-node_create-iso:
+ version: '{version}'
distro: '{distro}'
scm :
- ovirt-node-iso:
--
To view, visit https://gerrit.ovirt.org/41611
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaec7563815eb0a526190da5a7246590cd95b1364
Gerrit-PatchSet: 1
Gerrit-Project: jenkins
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rba...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
