summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lucas <jflucas@research.att.com>2019-04-15 13:05:01 -0400
committerJack Lucas <jflucas@research.att.com>2019-04-15 13:05:17 -0400
commitf620e8a9379e8d926d4e66861adfefe334426e3c (patch)
tree3ef0b3aaf1a008b6092ddcdd15fddc44f5d2c9e5
parent397862086166d473872e4ee41a7dc75dae050456 (diff)
Add wait for plugin upload
Issue-ID: DCAEGEN2-1436 Change-Id: Icb781ebf5320034b884a0d7357b4dcac5775e3f9 Signed-off-by: Jack Lucas <jflucas@research.att.com>
-rwxr-xr-xk8s-bootstrap-container/bootstrap.sh10
-rw-r--r--k8s-bootstrap-container/pom.xml2
2 files changed, 11 insertions, 1 deletions
diff --git a/k8s-bootstrap-container/bootstrap.sh b/k8s-bootstrap-container/bootstrap.sh
index 257775d..838e1e0 100755
--- a/k8s-bootstrap-container/bootstrap.sh
+++ b/k8s-bootstrap-container/bootstrap.sh
@@ -186,6 +186,16 @@ do
install_plugin ${wagon}
done
+# In some oversubscribed cloud environments, we have
+# observed that even though the plugin installations appear
+# to have completed, there are background installation tasks
+# that might still be running. So we check for running system workflows
+while cm_hasany "executions?is_system_workflow=true&status=pending&status=started&status=queued&status=scheduled"
+do
+ echo "Waiting for running system workflows to complete"
+ sleep 15
+done
+
# After this point, failures should not stop the script or block later commands
trap - ERR
set +e
diff --git a/k8s-bootstrap-container/pom.xml b/k8s-bootstrap-container/pom.xml
index e01257f..c51287e 100644
--- a/k8s-bootstrap-container/pom.xml
+++ b/k8s-bootstrap-container/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
<groupId>org.onap.dcaegen2.deployments</groupId>
<artifactId>k8s-bootstrap-container</artifactId>
<name>dcaegen2-deployments-k8s-bootstrap-container</name>
- <version>1.4.13</version>
+ <version>1.4.14</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>