From: Eric Ball <eball@linuxfoundation.org>
Date: Wed, 18 Sep 2019 16:49:46 +0000 (+0000)
Subject: Merge "ta: Make arm64 RPM verify jobs non-voting"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=e29caa031967865013a912d4aa1d7fb06e94d963;hp=8c467e1302f734f3ba751e490d1000f490f234f9

Merge "ta: Make arm64 RPM verify jobs non-voting"
---

diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml
index 7181425..781e66f 100644
--- a/jjb/akraino-templates/akraino-ta-common-macros.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml
@@ -81,7 +81,7 @@
     builders:
         - shell: |2-
             echo "---> Node UUID:"
-            curl -s http://169.254.169.254/openstack/latest/meta_data.json | python -c 'import sys, json; data = json.load(sys.stdin); print(data["uuid"])'
+            curl -s http://169.254.169.254/openstack/latest/meta_data.json | python -c 'import sys, json; data = json.load(sys.stdin); print(data["uuid"])' || true
 
 - builder:
     name: ta-builder-tox
diff --git a/jjb/shell/ta-rpm-deploy.sh b/jjb/shell/ta-rpm-deploy.sh
index da977c7..f0381e8 100644
--- a/jjb/shell/ta-rpm-deploy.sh
+++ b/jjb/shell/ta-rpm-deploy.sh
@@ -37,7 +37,7 @@ mkdir -p "$sources_dir"
 for artifact in \
   `ls $results_dir/repo/*.rpm`
     do
-        if curl --head --fail $nexus_repo_url/$release_path/rpms/$(uname -m)/$(basename $artifact)
+        if curl -L --head --fail $nexus_repo_url/$release_path/rpms/$(uname -m)/$(basename $artifact)
         then
             echo "RPM - $(basename $artifact) already available in Nexus"
             mv $results_dir/repo/$(basename $artifact) $results_dir/repo/duplicates/
@@ -51,7 +51,7 @@ for artifact in \
 for artifact in \
   `ls $results_dir/src_repo/*.rpm`
     do
-        if curl --head --fail $nexus_repo_url/$release_path/rpms/Sources/$(basename $artifact)
+        if curl -L --head --fail $nexus_repo_url/$release_path/rpms/Sources/$(basename $artifact)
         then
             echo "Source RPM - $(basename $artifact) already available in Nexus"
             mv $results_dir/src_repo/$(basename $artifact) $results_dir/src_repo/duplicates/