Merge branches 'w/2.9/bugfix/deletion-of-nodeaffinity-pods-in-ci' and…

… 'q/3179/2.8/bugfix/deletion-of-nodeaffinity-pods-in-ci' into tmp/octopus/q/2.9
scality · Mar 9, 2021 · dbe0cdb · dbe0cdb
3 parents 78183bd + 82f30c9 + 526981f
commit dbe0cdb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/eve/main.yml b/eve/main.yml
@@ -1916,7 +1916,7 @@ stages:
           command: |
             ssh -F ssh_config bootstrap <<ENDSSH
             for ns in \$(sudo kubectl get ns --kubeconfig=/etc/kubernetes/admin.conf -o jsonpath='{.items[*].metadata.name}'); do
-                node_aff_pods=\$(sudo kubectl get pods --kubeconfig=/etc/kubernetes/admin.conf -n "\$ns" | grep NodeAffinity | awk '{print \$1}' | tr \\n ' ')
+                node_aff_pods=\$(sudo kubectl get pods --kubeconfig=/etc/kubernetes/admin.conf -n "\$ns" | grep NodeAffinity | awk '{print \$1}' | tr \\\n ' ')
                 if [ "\$node_aff_pods" ]; then
                     sudo kubectl delete pods --kubeconfig=/etc/kubernetes/admin.conf -n "\$ns" \$node_aff_pods
                 fi
@@ -2418,7 +2418,7 @@ stages:
           # NOTE: Increase timeout as restore may take some time
           # Since we use pytest we do not have any output until restore totaly
           # finished
-          timeout: 1800
+          timeout: 2700
           env:
             <<: *_env_bastion_tests
             PYTEST_FILTERS: "restore"