From 679475b06faf64786ac416fb3b7723b603110ef2 Mon Sep 17 00:00:00 2001
From: Teresa Ho <teresa.ho@windriver.com>
Date: Wed, 27 May 2020 09:57:05 -0400
Subject: [PATCH] Add auto-versioning to starlingx/fault packages

This update changed the TIS_PATCH_VER to use the PKG_GITREVCOUNT
variable to auto-version the packages.

Adds an upper constraint to fm-rest-api to pass zuul.

Story: 2006740
Task: 39842

Change-Id: I4a180f1395ff9764ecc9d617a514e265db670b9c
Signed-off-by: Teresa Ho <teresa.ho@windriver.com>
---
 fm-api/centos/build_srpm.data          | 2 +-
 fm-common/centos/build_srpm.data       | 2 +-
 fm-doc/centos/build_srpm.data          | 2 +-
 fm-mgr/centos/build_srpm.data          | 2 +-
 fm-rest-api/centos/build_srpm.data     | 2 +-
 fm-rest-api/fm/tox.ini                 | 3 ++-
 python-fmclient/centos/build_srpm.data | 2 +-
 snmp-audittrail/centos/build_srpm.data | 2 +-
 snmp-ext/centos/build_srpm.data        | 2 +-
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/fm-api/centos/build_srpm.data b/fm-api/centos/build_srpm.data
index 380e9a00..3d66cb2e 100755
--- a/fm-api/centos/build_srpm.data
+++ b/fm-api/centos/build_srpm.data
@@ -1,4 +1,4 @@
 SRC_DIR="."
 EXCLUDE_FILES_FROM_TAR="centos"
 
-TIS_PATCH_VER=14
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/fm-common/centos/build_srpm.data b/fm-common/centos/build_srpm.data
index c86df7a2..3107c380 100644
--- a/fm-common/centos/build_srpm.data
+++ b/fm-common/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="sources"
-TIS_PATCH_VER=9
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/fm-doc/centos/build_srpm.data b/fm-doc/centos/build_srpm.data
index cce66760..da0f201f 100644
--- a/fm-doc/centos/build_srpm.data
+++ b/fm-doc/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="fm_doc"
-TIS_PATCH_VER=16
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/fm-mgr/centos/build_srpm.data b/fm-mgr/centos/build_srpm.data
index 188f58ba..3107c380 100644
--- a/fm-mgr/centos/build_srpm.data
+++ b/fm-mgr/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="sources"
-TIS_PATCH_VER=6
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/fm-rest-api/centos/build_srpm.data b/fm-rest-api/centos/build_srpm.data
index 1955a345..59c9b415 100644
--- a/fm-rest-api/centos/build_srpm.data
+++ b/fm-rest-api/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="fm"
-TIS_PATCH_VER=3
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/fm-rest-api/fm/tox.ini b/fm-rest-api/fm/tox.ini
index f883d69e..9ca42d2e 100644
--- a/fm-rest-api/fm/tox.ini
+++ b/fm-rest-api/fm/tox.ini
@@ -10,7 +10,8 @@ setenv = VIRTUAL_ENV={envdir}
          OS_STDOUT_CAPTURE=1
          OS_STDERR_CAPTURE=1
          OS_TEST_TIMEOUT=60
-deps = -r{toxinidir}/test-requirements.txt
+deps = -chttps://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt
+       -r{toxinidir}/test-requirements.txt
        -e{[tox]stxdir}/config/tsconfig/tsconfig
        -e{[tox]stxdir}/config/sysinv/cgts-client/cgts-client
        -e{[tox]stxdir}/fault/fm-api
diff --git a/python-fmclient/centos/build_srpm.data b/python-fmclient/centos/build_srpm.data
index b6520361..0f71e80e 100644
--- a/python-fmclient/centos/build_srpm.data
+++ b/python-fmclient/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="fmclient"
-TIS_PATCH_VER=4
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/snmp-audittrail/centos/build_srpm.data b/snmp-audittrail/centos/build_srpm.data
index 5c86664a..3107c380 100644
--- a/snmp-audittrail/centos/build_srpm.data
+++ b/snmp-audittrail/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="sources"
-TIS_PATCH_VER=4
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/snmp-ext/centos/build_srpm.data b/snmp-ext/centos/build_srpm.data
index 9b409b6c..3107c380 100644
--- a/snmp-ext/centos/build_srpm.data
+++ b/snmp-ext/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="sources"
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT