Anatoly Litovsky has uploaded a new change for review.
Change subject: Splitting the build of iso from ovirt-node rpms
......................................................................
Splitting the build of iso from ovirt-node rpms
Change-Id: Iabe34cfe78c3a1080c9890f3a8888655c887bc15
Signed-off-by: Tolik Litovsky <tlito...@redhat.com>
---
M jobs/confs/shell-scripts/build-local-ovirt-node-iso.sh
M jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
2 files changed, 12 insertions(+), 34 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/17/39417/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 8c78b92..c229321 100755
--- a/jobs/confs/shell-scripts/build-local-ovirt-node-iso.sh
+++ b/jobs/confs/shell-scripts/build-local-ovirt-node-iso.sh
@@ -4,11 +4,6 @@
DISTRO="{distro}"
-do_build=true
-do_clean={clean_pre}
-
-do_publish_rpms={publish_rpms}
-
# the die on error function
function die {{
echo "$1"
@@ -21,7 +16,7 @@
export CACHE="$PWD"/build
export OVIRT_NODE_BASE="$PWD"
export OVIRT_CACHE_DIR="$CACHE/$DISTRO"
- export OVIRT_LOCAL_REPO=file://"$OVIRT_CACHE_DIR"/ovirt
+ export PATH=$PATH:/usr/sbin
}}
@@ -31,16 +26,10 @@
function build_iso {{
pushd .
cd "$OVIRT_NODE_BASE"
- cat > extra-recipe.ks <<EOF_ks
-%packages --excludedocs --nobase
-ovirt-node-plugin-vdsm
-ovirt-node-plugin-hosted-engine
-%end
-EOF_ks
cd "$OVIRT_NODE_BASE"/ovirt-node-iso
- ./autogen.sh \
- --with-recipe=../ovirt-node/recipe \
- --with-extra-recipe=../extra-recipe.ks
+ ./autogen.sh
+ chmod +x recepie-downloader.sh
+ ./recepie-downloader.sh install
if ! make iso publish ; then
die "ISO build failed"
fi
@@ -52,9 +41,6 @@
#the prereqs
function check_pre {{
- if [[ ! -d $OVIRT_NODE_BASE/ovirt-node ]] ; then
- die "No node base found"
- fi
if [[ ! -d $OVIRT_NODE_BASE/ovirt-node-iso ]] ; then
die "No node-ISO base found"
fi
@@ -68,7 +54,10 @@
# get rid of old makefiles
git clean -dfx
# generate new makefiles
- ./autogen.sh
+ /autogen.sh
+ chmod +x recepie-downloader.sh
+ ./recepie-downloader.sh remove
+ ./recepie-downloader.sh remove-repo
make clean \
|| clean_failed=true
popd
@@ -88,15 +77,7 @@
mkdir -p "$dir"
done
+clean_iso
+build_iso
-if $do_clean; then
- clean_iso
-fi
-
-if $do_build; then
- build_iso
-fi
-
-if $do_publish_rpms; then
- cp "$OVIRT_CACHE_DIR"/ovirt/binary/*.iso exported-artifacts/
-fi
+cp "$OVIRT_CACHE_DIR"/ovirt/binary/*.iso exported-artifacts/
diff --git a/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
b/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
index 673c802..7f00e10 100644
--- a/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
+++ b/jobs/confs/yaml/templates/ovirt-node-job-templates.yaml
@@ -12,13 +12,10 @@
clean_pre: 'false'
publish_rpms: 'true'
scm :
- - ovirt-node:
- branch: '{version}'
- ovirt-node-iso:
branch: '{version}'
triggers:
- - ovirt-node-{trigger}:
- branch: '{branch}'
+ - timed: '@daily'
publishers:
- ovirt-node-cleanup:
distro: '{distro}'
--
To view, visit https://gerrit.ovirt.org/39417
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabe34cfe78c3a1080c9890f3a8888655c887bc15
Gerrit-PatchSet: 1
Gerrit-Project: jenkins
Gerrit-Branch: master
Gerrit-Owner: Anatoly Litovsky <tlito...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
