Build and test script fixes for running 2 containers in onos pod

Change-Id: I449804bb8ce4ddc9f81182fa57e9ed3d8291a98e
diff --git a/Jenkinsfile-attworkflow-build b/Jenkinsfile-attworkflow-build
index 9d315e6..785ff70 100644
--- a/Jenkinsfile-attworkflow-build
+++ b/Jenkinsfile-attworkflow-build
@@ -130,7 +130,7 @@
                         waitUntil {
                             onos_completed = sh returnStdout: true, script: """
                             export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
-                            kubectl get pods | grep -i onos | grep -i running | grep 1/1 | wc -l
+                            kubectl get pods | grep -i onos | grep -i running | grep 2/2 | wc -l
                             """
                             return onos_completed.toInteger() == 1
                         }