Omaha #2991 Fixed REST URL in Python scripts, Added checks to broker build commands to fail if they didnt work.
Change-Id: I9bc88caa14d08861eb4dd4628b729bedc8500325 Former-commit-id:92f11c79c1
[formerly132ac21917
] [formerlye0525f7816
] [formerly92f11c79c1
[formerly132ac21917
] [formerlye0525f7816
] [formerly3686a36ae7
[formerlye0525f7816
[formerly 89acb99f0639f34e4ba3530e49c81ce5dda42785]]]] Former-commit-id:3686a36ae7
Former-commit-id:bf0c744699
[formerlybf66116b50
] [formerly a54e6fce82494d16799fb7d7e0b2263a4942e965 [formerly66e3669532
]] Former-commit-id: a5ea213f8d74189bc56129574e7cc290f7e60b8f [formerly40087c34e4
] Former-commit-id:bcb7dbce05
This commit is contained in:
parent
742e8dad9b
commit
e98fca85c7
3 changed files with 12 additions and 4 deletions
|
@ -75,7 +75,7 @@ class RestManager():
|
|||
httpConn.timeout = _connTimeout
|
||||
|
||||
httpConn.connect()
|
||||
httpConn.request("GET", "/rest/" + service)
|
||||
httpConn.request("GET", "/api/v2/" + service)
|
||||
response = httpConn.getresponse()
|
||||
|
||||
if (response.status != 200):
|
||||
|
|
|
@ -250,7 +250,7 @@ class RestManager():
|
|||
httpConn.timeout = _connTimeout
|
||||
|
||||
httpConn.connect()
|
||||
httpConn.request("GET", "/rest/" + service)
|
||||
httpConn.request("GET", "/api/v2/" + service)
|
||||
response = httpConn.getresponse()
|
||||
|
||||
if (response.status != 200):
|
||||
|
|
|
@ -77,7 +77,7 @@ function buildQPID()
|
|||
return 1
|
||||
fi
|
||||
|
||||
# Copy the 0.28 qpid rpms
|
||||
# Copy the 0.30 qpid rpms
|
||||
cd ${WORKSPACE}/rpms/awips2.qpid/0.30/RPMS/noarch
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "ERROR: Failed to build Qpid v0.30."
|
||||
|
@ -101,7 +101,15 @@ function buildQPID()
|
|||
#build 0.30
|
||||
export AWIPS_II_TOP_DIR
|
||||
cd ${WORKSPACE}/installers/RPMs/qpid-java-broker-0.30
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "ERROR: Failed to build Qpid Broker v0.30."
|
||||
return 1
|
||||
fi
|
||||
/bin/bash build.sh
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "ERROR: Failed to build Qpid Broker v0.30."
|
||||
return 1
|
||||
fi
|
||||
|
||||
popd > /dev/null 2>&1
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue