summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuan Xie <huan.xie@citrix.com>2017-03-13 23:49:13 -0700
committerHuan Xie <huan.xie@citrix.com>2017-03-13 23:49:13 -0700
commitfea2e5d9a56fe324721482c555d9415421386673 (patch)
tree1388c420e6e5f940c488853e1571a4259688de72
parentf03fb9f1ed3b5d6066863514b74c037391d6d89a (diff)
Use XCP as platform name in build supplementak packages
As we will support both XenServer and branded products at the same time, so when building the supplemenatl packages, using the common XCP as platform name is better, this fix to to use XCP Change-Id: Ib8b79608c6cfdb85f3718c7daefaccc120a3e775
Notes
Notes (review): Verified+1: Citrix XenServer CI Code-Review+2: Bob Ball <bob.ball@citrix.com> Workflow+1: Bob Ball <bob.ball@citrix.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 14 Mar 2017 10:51:50 +0000 Reviewed-on: https://review.openstack.org/445319 Project: openstack/fuel-plugin-xenserver Branch: refs/heads/master
-rw-r--r--Makefile2
-rwxr-xr-xsuppack/build-xenserver-suppack.sh15
2 files changed, 7 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index e00367a..6379b4e 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ REQUIRED_ISOS=$(PLATFORMS:%=suppack/xcp_%/xenapi-plugins-${OPENSTACK_RELEASE}.is
26iso: $(REQUIRED_ISOS) 26iso: $(REQUIRED_ISOS)
27 27
28$(REQUIRED_ISOS): plugin_source/deployment_scripts/patchset/xenhost 28$(REQUIRED_ISOS): plugin_source/deployment_scripts/patchset/xenhost
29 suppack/build-xenserver-suppack.sh ${OPENSTACK_RELEASE} "${HYPERVISOR_NAME}" 29 suppack/build-xenserver-suppack.sh ${OPENSTACK_RELEASE}
30 30
31${BUILDROOT}/${PLUGIN_NAME}/branded: ${BRANDING} ${REQUIRED_ISOS} plugin_source 31${BUILDROOT}/${PLUGIN_NAME}/branded: ${BRANDING} ${REQUIRED_ISOS} plugin_source
32 mkdir -p ${BUILDROOT}/${PLUGIN_NAME} 32 mkdir -p ${BUILDROOT}/${PLUGIN_NAME}
diff --git a/suppack/build-xenserver-suppack.sh b/suppack/build-xenserver-suppack.sh
index 83283a2..929c97d 100755
--- a/suppack/build-xenserver-suppack.sh
+++ b/suppack/build-xenserver-suppack.sh
@@ -4,13 +4,12 @@ set -eux
4 4
5# ============================================= 5# =============================================
6# Usage of this script: 6# Usage of this script:
7# ./build-xenserver-suppack.sh os-release hypervisor-name xs-plugin-version key 7# ./build-xenserver-suppack.sh os-release xs-plugin-version key
8# Or 8# Or
9# ./build-xenserver-suppack.sh 9# ./build-xenserver-suppack.sh
10# 10#
11# You can provide explict input parameters or you can use the default ones: 11# You can provide explict input parameters or you can use the default ones:
12# OpenStack release 12# OpenStack release
13# Hypervisor name
14# XenServer OpenStack plugin version 13# XenServer OpenStack plugin version
15# Key for building supplemental packages 14# Key for building supplemental packages
16# Keyfile for building supplemental packages 15# Keyfile for building supplemental packages
@@ -46,16 +45,14 @@ mkdir -p $BUILDROOT && cd $BUILDROOT
46# OpenStack release 45# OpenStack release
47OS_RELEASE=${1:-"mitaka"} 46OS_RELEASE=${1:-"mitaka"}
48 47
49HYPERVISOR_NAME=${2:-"XenServer"}
50
51# nova and neutron xenserver dom0 plugin version 48# nova and neutron xenserver dom0 plugin version
52XS_PLUGIN_VERSION=${3:-"13.0.0"} 49XS_PLUGIN_VERSION=${2:-"13.0.0"}
53 50
54# key of the public/secret OpenStack GPG key 51# key of the public/secret OpenStack GPG key
55SUPPACK_KEY=${4:-"Citrix OpenStack (XenServer Updates) <openstack@citrix.com>"} 52SUPPACK_KEY=${3:-"Citrix OpenStack (XenServer Updates) <openstack@citrix.com>"}
56 53
57# keyfile 54# keyfile
58SUPPACK_KEYFILE=${5:-"RPM-GPG-KEY-XS-OPENSTACK"} 55SUPPACK_KEYFILE=${4:-"RPM-GPG-KEY-XS-OPENSTACK"}
59 56
60# branch info 57# branch info
61GITBRANCH="stable/$OS_RELEASE" 58GITBRANCH="stable/$OS_RELEASE"
@@ -189,7 +186,7 @@ EOF
189python buildscript.py \ 186python buildscript.py \
190--pdn=xenapi-plugins-$OS_RELEASE \ 187--pdn=xenapi-plugins-$OS_RELEASE \
191--pdv="1.9.0" \ 188--pdv="1.9.0" \
192--hvn="$HYPERVISOR_NAME" \ 189--hvn="XCP" \
193--desc="OpenStack Plugins" \ 190--desc="OpenStack Plugins" \
194--bld=0 \ 191--bld=0 \
195--out=$SUPPACK_CREEDENCE \ 192--out=$SUPPACK_CREEDENCE \
@@ -199,7 +196,7 @@ $NEUTRON_RPMFILE
199python buildscript.py \ 196python buildscript.py \
200--pdn=xenapi-plugins-$OS_RELEASE \ 197--pdn=xenapi-plugins-$OS_RELEASE \
201--pdv="2.1.0" \ 198--pdv="2.1.0" \
202--hvn="$HYPERVISOR_NAME" \ 199--hvn="XCP" \
203--desc="OpenStack Plugins" \ 200--desc="OpenStack Plugins" \
204--bld=0 \ 201--bld=0 \
205--out=$SUPPACK_DUNDEE \ 202--out=$SUPPACK_DUNDEE \