diff options
| -rwxr-xr-x | ci/utility/intel_cmt_cat_build_install_rpm.sh | 4 | ||||
| -rwxr-xr-x | ci/utility/package-list.sh | 2 | ||||
| -rw-r--r-- | requirements.txt | 3 | ||||
| -rw-r--r-- | setup.py | 21 |
4 files changed, 20 insertions, 10 deletions
diff --git a/ci/utility/intel_cmt_cat_build_install_rpm.sh b/ci/utility/intel_cmt_cat_build_install_rpm.sh index a04d0a08..ba6bec07 100755 --- a/ci/utility/intel_cmt_cat_build_install_rpm.sh +++ b/ci/utility/intel_cmt_cat_build_install_rpm.sh @@ -22,14 +22,14 @@ bash $DIR/check_git_repo.sh $CMTCAT_DIR $CMTCAT_REPO if [[ $? != 0 ]] then rm -rf $CMTCAT_DIR - git clone --branch $CMTCAT_BRANCH $CMTCAT_REPO $CMTCAT_DIR + git clone $CMTCAT_REPO $CMTCAT_DIR else cd $CMTCAT_DIR git reset HEAD --hard git pull - git checkout -f $CMTCAT_BRANCH fi cd $CMTCAT_DIR +git checkout -b intel_rdt $CMTCAT_BRANCH wget https://github.com/01org/intel-cmt-cat/archive/${VERSION}.tar.gz --directory-prefix=$CMTCAT_DIR mv $CMTCAT_DIR/${VERSION}.tar.gz $RPM_WORKDIR/SOURCES/ rpmbuild --define "_topdir $RPM_WORKDIR" -bb $CMTCAT_DIR/rpm/intel-cmt-cat.spec diff --git a/ci/utility/package-list.sh b/ci/utility/package-list.sh index 0594e5bb..8cd1a7d8 100755 --- a/ci/utility/package-list.sh +++ b/ci/utility/package-list.sh @@ -20,7 +20,7 @@ COLLECTD_DIR=$WORKSPACE/collectd CMTCAT_DIR=$WORKSPACE/intel-cmt-cat CMTCAT_REPO=https://github.com/01org/intel-cmt-cat.git -CMTCAT_BRANCH=master +CMTCAT_BRANCH=8b27ad757e86a01bc51eafcb9e600605ff1beca4 CMTCAT_VERSION="v1.1.0" COLLECTD_REPO=https://github.com/collectd/collectd.git diff --git a/requirements.txt b/requirements.txt index a5af6579..8ee198f7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,6 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. paramiko>=2.0 # LGPLv2.1+ requests!=2.12.2,>=2.10.0 # Apache-2.0 python-keystoneclient>=3.8.0 # Apache-2.0 @@ -1,12 +1,19 @@ -#!/usr/bin/env python - -# Copyright (c) 2017 Orange and others. +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools # In python < 2.7.4, a lazy loading of package `pbr` will break |