Merge branches 'w/2.9/bugfix/ci-single-node-test' and 'q/3200/2.8/bug…

…fix/ci-single-node-test' into tmp/octopus/q/2.9
scality · Mar 15, 2021 · 2166615 · 2166615
3 parents e04980f + 8d651ae + 3f7ba7c
commit 2166615
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/eve/main.yml b/eve/main.yml
@@ -691,7 +691,7 @@ models:
         create-env --name "$ENVIRONMENT_NAME"
       workdir: build/eve/workers/openstack-terraform/terraform/
       haltOnFailure: true
-  - ShellCommand: &untaint_bootstrap
+  - ShellCommand: &untaint_bootstrap_ssh
       doStepIf: "%(prop:install_solution:-false)s"
       name: Untaint Bootstrap before deploying a Solution
       env:
@@ -1532,6 +1532,14 @@ stages:
             git checkout "${BRANCH}" --quiet &&
             sudo -E eve/create-volumes.sh
           haltOnFailure: true
+      - ShellCommand: &untaint_bootstrap
+          name: Untaint Bootstrap node
+          env:
+            NODE_NAME: "bootstrap"
+          command: |
+            sudo kubectl --kubeconfig /etc/kubernetes/admin.conf \
+            patch node "$NODE_NAME" --patch '{"spec": {"taints": []}}'
+          haltOnFailure: true
       # --- Wait for the cluster to be stabilized ---
       - ShellCommand: *wait_pods_stable
       # --- Test version N ---
@@ -1642,6 +1650,7 @@ stages:
             BRANCH: "development/%(prop:product_version_prev)s"
             PRODUCT_TXT: "/srv/scality/metalk8s-%(prop:metalk8s_version_prev)s/product.txt"
             PRODUCT_MOUNT: "/srv/scality/metalk8s-%(prop:metalk8s_version_prev)s"
+      - ShellCommand: *untaint_bootstrap
       - ShellCommand: *wait_pods_stable
       # --- Test version N-1 ---
       - ShellCommand: *fast_tests_prev
@@ -1743,7 +1752,7 @@ stages:
       - ShellCommand: *run_bootstrap_ssh
       - ShellCommand: *provision_volumes_ssh
       - ShellCommand:
-          <<: *untaint_bootstrap
+          <<: *untaint_bootstrap_ssh
           doStepIf: true
     # NOTE: This section only run if property "install_solution" is True
     # {{{
@@ -2269,7 +2278,7 @@ stages:
       - ShellCommand: *import_solution
       - ShellCommand: *activate_solution
       - ShellCommand: *create_solution_env
-      - ShellCommand: *untaint_bootstrap
+      - ShellCommand: *untaint_bootstrap_ssh
       - ShellCommand: *deploy_solution
       - ShellCommand: *wait_for_solution_operator
     # }}}
@@ -2544,6 +2553,7 @@ stages:
       - ShellCommand: *run_bootstrap_ssh
       - ShellCommand: *provision_volumes_ssh
       - ShellCommand: *install_kubectl_bootstrap_ssh
+      - ShellCommand: *untaint_bootstrap_ssh
       - ShellCommand: *wait_pods_stable_ssh
       - ShellCommand:
           <<: *retrieve_iso