Merge "Add auto-versioning to starlingx/integ packages"

This commit is contained in:
Zuul 2020-06-30 03:01:38 +00:00 committed by Gerrit Code Review
commit 9a7eed14f2
85 changed files with 86 additions and 85 deletions

View File

@ -1 +1 @@
TIS_PATCH_VER=7 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=9 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=7 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
COPY_LIST="$CGCS_BASE/downloads/dpkg_1.18.24.tar.xz" COPY_LIST="$CGCS_BASE/downloads/dpkg_1.18.24.tar.xz"
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
SRC_DIR="files" SRC_DIR="files"
TIS_PATCH_VER=8 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=19 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
COPY_LIST="files/*" COPY_LIST="files/*"
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
COPY_LIST="$CGCS_BASE/downloads/dtc-1.4.4.tar.gz" COPY_LIST="$CGCS_BASE/downloads/dtc-1.4.4.tar.gz"
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=8 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
TIS_PATCH_VER=11 TIS_PATCH_VER=PKG_GITREVCOUNT
BUILD_IS_SLOW=3 BUILD_IS_SLOW=3

View File

@ -1 +1 @@
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=10 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
COPY_LIST="files/*" COPY_LIST="files/*"
TIS_PATCH_VER=16 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=3 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT
BUILD_IS_SLOW=7 BUILD_IS_SLOW=7

View File

@ -1,2 +1,2 @@
COPY_LIST="files/*" COPY_LIST="files/*"
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -2,5 +2,5 @@ COPY_LIST=" \
$STX_BASE/downloads/Redfishtool-1.1.0.tar.gz \ $STX_BASE/downloads/Redfishtool-1.1.0.tar.gz \
$PKG_BASE/files/* \ $PKG_BASE/files/* \
" "
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -22,6 +22,6 @@ if [ -f ${SRC_DIR}/src/.git_version ]; then
fi fi
TIS_BASE_SRCREV=02899bfda814146b021136e9d8e80eba494e1126 TIS_BASE_SRCREV=02899bfda814146b021136e9d8e80eba494e1126
TIS_PATCH_VER=GITREVCOUNT+1 TIS_PATCH_VER=GITREVCOUNT+PKG_GITREVCOUNT
BUILD_IS_BIG=40 BUILD_IS_BIG=40
BUILD_IS_SLOW=26 BUILD_IS_SLOW=26

View File

@ -1 +1 @@
TIS_PATCH_VER=4 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=11 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=10 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=6 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -13,4 +13,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz"
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -13,4 +13,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz"
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -9,4 +9,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz $FILES_BA
TIS_PATCH_VER=3 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -9,4 +9,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz $FILES_BA
TIS_PATCH_VER=9 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -13,4 +13,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz"
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=4 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -6,4 +6,4 @@ GIT_SHA=480f13af6d17d1d3fcf0dc7b4bd04b49fa4099e1
COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz" COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz"
TIS_PATCH_VER=3 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -9,4 +9,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz $FILES_BA
TIS_PATCH_VER=5 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -13,4 +13,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz $FILES_BA
TIS_PATCH_VER=7 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -13,4 +13,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz"
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -9,4 +9,4 @@ COPY_LIST="$CGCS_BASE/downloads/puppet/$PREFIX-$MODULE-$GIT_SHA.tar.gz $FILES_BA
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -5,4 +5,4 @@ GIT_SHA=c1c47f4edfd761d1bbde32a75da0c3fa7cc93a81
COPY_LIST="$CGCS_BASE/downloads/puppet/$MODULE-$GIT_SHA.tar.gz" COPY_LIST="$CGCS_BASE/downloads/puppet/$MODULE-$GIT_SHA.tar.gz"
TIS_PATCH_VER=0 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=6 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,4 +1,4 @@
COPY_LIST="$CGCS_BASE/downloads/mariadb-10.1.28.tar.gz $PKG_BASE/centos/files/*" COPY_LIST="$CGCS_BASE/downloads/mariadb-10.1.28.tar.gz $PKG_BASE/centos/files/*"
TIS_PATCH_VER=15 TIS_PATCH_VER=PKG_GITREVCOUNT
BUILD_IS_BIG=7 BUILD_IS_BIG=7
BUILD_IS_SLOW=19 BUILD_IS_SLOW=19

View File

@ -1,2 +1,2 @@
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,4 +1,4 @@
COPY_LIST="$FILES_BASE/* \ COPY_LIST="$FILES_BASE/* \
$DISTRO/patches/* \ $DISTRO/patches/* \
$CGCS_BASE/downloads/drbd-8.4.3.tar.gz" $CGCS_BASE/downloads/drbd-8.4.3.tar.gz"
TIS_PATCH_VER=7 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,3 +1,3 @@
COPY_LIST="files/resizepart.sh" COPY_LIST="files/resizepart.sh"
TIS_PATCH_VER=3 TIS_PATCH_VER=PKG_GITREVCOUNT
BUILD_IS_SLOW=5 BUILD_IS_SLOW=5

View File

@ -1,3 +1,3 @@
COPY_LIST="" COPY_LIST=""
TIS_PATCH_VER=12 TIS_PATCH_VER=PKG_GITREVCOUNT
BUILD_IS_SLOW=8 BUILD_IS_SLOW=8

View File

@ -1,2 +1,2 @@
COPY_LIST="" COPY_LIST=""
TIS_PATCH_VER=3 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -3,4 +3,4 @@ COPY_LIST="${STX_BASE}/downloads/containerd-v1.3.3.tar.gz
${STX_BASE}/downloads/crictl-v1.18.0-linux-amd64.tar.gz ${STX_BASE}/downloads/crictl-v1.18.0-linux-amd64.tar.gz
${FILES_BASE}/*" ${FILES_BASE}/*"
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -2,5 +2,5 @@ VERSION=2.7.1
TAR_NAME="docker-distribution" TAR_NAME="docker-distribution"
TAR="$TAR_NAME-v$VERSION.tar.gz" TAR="$TAR_NAME-v$VERSION.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR $FILES_BASE/*" COPY_LIST="${CGCS_BASE}/downloads/$TAR $FILES_BASE/*"
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -3,4 +3,4 @@ TAR_NAME=etcd
TAR="$TAR_NAME-v$VERSION.tar.gz" TAR="$TAR_NAME-v$VERSION.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR $FILES_BASE/*" COPY_LIST="${CGCS_BASE}/downloads/$TAR $FILES_BASE/*"
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -3,4 +3,5 @@ TAR_NAME=helm
TAR="$TAR_NAME-v$VERSION-linux-amd64.tar.gz" TAR="$TAR_NAME-v$VERSION-linux-amd64.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR $FILES_BASE/*" COPY_LIST="${CGCS_BASE}/downloads/$TAR $FILES_BASE/*"
TIS_PATCH_VER=0 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -6,4 +6,4 @@ CONTRIB="$TAR_NAME-contrib-v$CON_VERSION.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR ${CGCS_BASE}/downloads/$CONTRIB $FILES_BASE/*" COPY_LIST="${CGCS_BASE}/downloads/$TAR ${CGCS_BASE}/downloads/$CONTRIB $FILES_BASE/*"
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,3 +1,3 @@
COPY_LIST="files/* \ COPY_LIST="files/* \
$CGCS_BASE/downloads/ldapscripts-2.0.8.tgz" $CGCS_BASE/downloads/ldapscripts-2.0.8.tgz"
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
TIS_PATCH_VER=9 TIS_PATCH_VER=PKG_GITREVCOUNT
BUILD_IS_SLOW=3 BUILD_IS_SLOW=3

View File

@ -1 +1 @@
TIS_PATCH_VER=4 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,4 +1,4 @@
COPY_LIST="$CGCS_BASE/downloads/lldpd-0.9.0.tar.gz \ COPY_LIST="$CGCS_BASE/downloads/lldpd-0.9.0.tar.gz \
$PKG_BASE/lldpd-0.9.0/* \ $PKG_BASE/lldpd-0.9.0/* \
$PKG_BASE/centos/files/*" $PKG_BASE/centos/files/*"
TIS_PATCH_VER=5 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
COPY_LIST="files/*" COPY_LIST="files/*"
TIS_PATCH_VER=3 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -2,5 +2,5 @@ COPY_LIST="files/* \
$PATCHES_BASE/* \ $PATCHES_BASE/* \
$STX_BASE/downloads/openvswitch-2.11.0.tar.gz \ $STX_BASE/downloads/openvswitch-2.11.0.tar.gz \
$STX_BASE/downloads/dpdk-18.11.tar.xz" $STX_BASE/downloads/dpdk-18.11.tar.xz"
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT
BUILD_IS_SLOW=12 BUILD_IS_SLOW=12

View File

@ -1,4 +1,4 @@
TAR_NAME=python-ryu TAR_NAME=python-ryu
SRC_DIR="$CGCS_BASE/git/ryu" SRC_DIR="$CGCS_BASE/git/ryu"
TIS_BASE_SRCREV=51a1130f6cdcb029a51b6a75d43ac5e4cdde7072 TIS_BASE_SRCREV=51a1130f6cdcb029a51b6a75d43ac5e4cdde7072
TIS_PATCH_VER=GITREVCOUNT TIS_PATCH_VER=GITREVCOUNT+PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,3 +1,3 @@
COPY_LIST="$STX_BASE/downloads/html5lib-python-1.0.1.tar.gz" COPY_LIST="$STX_BASE/downloads/html5lib-python-1.0.1.tar.gz"
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,3 +1,3 @@
COPY_LIST="$STX_BASE/downloads/mechanize-0.4.5.tar.gz" COPY_LIST="$STX_BASE/downloads/mechanize-0.4.5.tar.gz"
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -2,4 +2,4 @@
COPY_LIST="$CGCS_BASE/downloads/python-setuptools-v38.5.1.tar.gz $PKG_BASE/files/*" COPY_LIST="$CGCS_BASE/downloads/python-setuptools-v38.5.1.tar.gz $PKG_BASE/files/*"
TIS_PATCH_VER=0 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,3 +1,3 @@
COPY_LIST="$STX_BASE/downloads/python-webencodings-0.5.1.tar.gz" COPY_LIST="$STX_BASE/downloads/python-webencodings-0.5.1.tar.gz"
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -4,4 +4,4 @@ TAR="$TAR_NAME-$VERSION.tar.gz"
# SRC_DIR="$TAR_NAME-$VERSION" # SRC_DIR="$TAR_NAME-$VERSION"
COPY_LIST="${CGCS_BASE}/downloads/$TAR" COPY_LIST="${CGCS_BASE}/downloads/$TAR"
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
COPY_LIST="$CGCS_BASE/downloads/libtpms-0.6.0-4f0d59d.tar.gz" COPY_LIST="$CGCS_BASE/downloads/libtpms-0.6.0-4f0d59d.tar.gz"
TIS_PATCH_VER=0 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
COPY_LIST="python-keyring/*" COPY_LIST="python-keyring/*"
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
TIS_PATCH_VER=2 TIS_PATCH_VER=PKG_GITREVCOUNT
COPY_LIST="$PKG_BASE/files/tis-shim.crt" COPY_LIST="$PKG_BASE/files/tis-shim.crt"

View File

@ -1,2 +1,2 @@
COPY_LIST="$CGCS_BASE/downloads/spectre-meltdown-checker-0.37+-5cc77741.tar.gz" COPY_LIST="$CGCS_BASE/downloads/spectre-meltdown-checker-0.37+-5cc77741.tar.gz"
TIS_PATCH_VER=0 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
COPY_LIST="$PKG_BASE/files/* $CGCS_BASE/downloads/swtpm-0.1.0-253eac5.tar.gz" COPY_LIST="$PKG_BASE/files/* $CGCS_BASE/downloads/swtpm-0.1.0-253eac5.tar.gz"
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
#COPY_LIST="tpm2-tools/*" #COPY_LIST="tpm2-tools/*"
TIS_PATCH_VER=0 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
COPY_LIST="$CGCS_BASE/downloads/tss2-930.tar.gz" COPY_LIST="$CGCS_BASE/downloads/tss2-930.tar.gz"
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,3 +1,3 @@
SRC_DIR=$CGCS_BASE/git/python-3parclient SRC_DIR=$CGCS_BASE/git/python-3parclient
TIS_BASE_SRCREV=d0e6de393cecc765eba70312c466e91405fb2a69 TIS_BASE_SRCREV=d0e6de393cecc765eba70312c466e91405fb2a69
TIS_PATCH_VER=1 TIS_PATCH_VER=GITREVCOUNT+PKG_GITREVCOUNT

View File

@ -1,3 +1,3 @@
SRC_DIR=$CGCS_BASE/git/python-lefthandclient SRC_DIR=$CGCS_BASE/git/python-lefthandclient
TIS_BASE_SRCREV=db9773f0f97c5af04da89fcb7dca2a6ddf8d5e4a TIS_BASE_SRCREV=db9773f0f97c5af04da89fcb7dca2a6ddf8d5e4a
TIS_PATCH_VER=1 TIS_PATCH_VER=GITREVCOUNT+PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
COPY_LIST="$CGCS_BASE/downloads/trident-installer-20.04.0.tar.gz" COPY_LIST="$CGCS_BASE/downloads/trident-installer-20.04.0.tar.gz"
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=4 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1,2 +1,2 @@
SRC_DIR="files" SRC_DIR="files"
TIS_PATCH_VER=1 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -1 +1 @@
TIS_PATCH_VER=3 TIS_PATCH_VER=PKG_GITREVCOUNT

View File

@ -5,5 +5,5 @@ COPY_LIST="\
$CGCS_BASE/downloads/gnulib-ffc927e.tar.gz \ $CGCS_BASE/downloads/gnulib-ffc927e.tar.gz \
$CGCS_BASE/downloads/keycodemapdb-16e5b07.tar.gz" $CGCS_BASE/downloads/keycodemapdb-16e5b07.tar.gz"
TIS_BASE_SRCREV=ab58260efaa712650c63bb1917122f270070fa4b TIS_BASE_SRCREV=ab58260efaa712650c63bb1917122f270070fa4b
TIS_PATCH_VER=101 TIS_PATCH_VER=GITREVCOUNT+PKG_GITREVCOUNT
BUILD_IS_SLOW=4 BUILD_IS_SLOW=4

View File

@ -6,5 +6,5 @@ COPY_LIST="$CGCS_BASE/downloads/kvm-unit-tests.git-4ea7633.tar.bz2 \
$PKG_BASE/qemu/qemu_clean.service \ $PKG_BASE/qemu/qemu_clean.service \
$PKG_BASE/qemu/qemu-system-x86.conf" $PKG_BASE/qemu/qemu-system-x86.conf"
TIS_BASE_SRCREV=38441756b70eec5807b5f60dad11a93a91199866 TIS_BASE_SRCREV=38441756b70eec5807b5f60dad11a93a91199866
TIS_PATCH_VER=100 TIS_PATCH_VER=GITREVCOUNT+PKG_GITREVCOUNT