move running provisioning host to jenkins agent in bml

Signed-off-by: Sunnatillo <[email protected]>
metal3-io · Mar 3, 2025 · e71424c · e71424c
1 parent 804242f
commit e71424c
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 58 deletions.
diff --git a/jenkins/scripts/bare_metal_lab/tasks/cleanup-tasks.yaml b/jenkins/scripts/bare_metal_lab/tasks/cleanup-tasks.yaml
@@ -64,6 +64,7 @@
     - /tmp/mariadb.csr
     - /tmp/ironic.csr
     - /tmp/manifests
+    - /tmp/vars.sh
     - /tmp/target_cluster_logs
     - "{{ serial_log_location }}"
 

diff --git a/jenkins/scripts/bare_metal_lab/tasks/deploy-tasks.yaml b/jenkins/scripts/bare_metal_lab/tasks/deploy-tasks.yaml
@@ -47,17 +47,6 @@
     cmd: "brctl addif provisioning eno1"
   become: true
 
-- name: Deploy bmhosts
-  template:
-    src: "templates/bmhosts_crs.yaml.j2"
-    dest: "/opt/metal3-dev-env/bmhosts_crs.yaml"
-
-- name: Apply bmhosts manifest
-  shell:
-    cmd: kubectl apply -f ./bmhosts_crs.yaml -n metal3
-    chdir: "/opt/metal3-dev-env/"
-  tags: kubectl_apply
-
 - name: Set VLAN 3 interface to be up
   shell:
     cmd: "ip link set up dev bmext"
@@ -80,6 +69,17 @@
   when: brctl_grep_bmext.rc != 0
   tags: bmext
 
+- name: Deploy bmhosts
+  template:
+    src: "templates/bmhosts_crs.yaml.j2"
+    dest: "/opt/metal3-dev-env/bmhosts_crs.yaml"
+
+- name: Apply bmhosts manifest
+  shell:
+    cmd: kubectl apply -f ./bmhosts_crs.yaml -n metal3
+    chdir: "/opt/metal3-dev-env/"
+  tags: kubectl_apply
+
 - name: Wait until all BMHs become available .
   kubernetes.core.k8s_info:
     api_version: metal3.io/v1alpha1

diff --git a/jenkins/scripts/bml_cleanup.sh b/jenkins/scripts/bml_cleanup.sh
@@ -8,24 +8,28 @@ set -eu
 # Usage:
 #  cleanup_bml.sh
 #
+
+CI_DIR="$(dirname "$(readlink -f "${0}")")"
+
 echo "Cleaning up the lab"
 # Execute remote script
 # shellcheck disable=SC2029
 
-TEST_EXECUTER_IP="192.168.1.3"
+# TEST_EXECUTER_IP="192.168.1.3"
+
+# ssh \
+#     -o StrictHostKeyChecking=no \
+#     -o UserKnownHostsFile=/dev/null \
+#     -o ServerAliveInterval=15 \
+#     -o ServerAliveCountMax=10 \
+#     -o SendEnv="BML_ILO_USERNAME" \
+#     -o SendEnv="BML_ILO_PASSWORD" \
+#     -o SendEnv="GITHUB_TOKEN" \
+#     -o SendEnv="REPO_NAME" \
+#     -o SendEnv="BML_METAL3_DEV_ENV_REPO" \
+#     -o SendEnv="BML_METAL3_DEV_ENV_BRANCH" \
+#     -o SendEnv="PR_ID" \
+#     -i "${METAL3_CI_USER_KEY}" \
+#     "${METAL3_CI_USER}"@"${TEST_EXECUTER_IP}" \
 
-ssh \
-    -o StrictHostKeyChecking=no \
-    -o UserKnownHostsFile=/dev/null \
-    -o ServerAliveInterval=15 \
-    -o ServerAliveCountMax=10 \
-    -o SendEnv="BML_ILO_USERNAME" \
-    -o SendEnv="BML_ILO_PASSWORD" \
-    -o SendEnv="GITHUB_TOKEN" \
-    -o SendEnv="REPO_NAME" \
-    -o SendEnv="BML_METAL3_DEV_ENV_REPO" \
-    -o SendEnv="BML_METAL3_DEV_ENV_BRANCH" \
-    -o SendEnv="PR_ID" \
-    -i "${METAL3_CI_USER_KEY}" \
-    "${METAL3_CI_USER}"@"${TEST_EXECUTER_IP}" \
-    ANSIBLE_FORCE_COLOR=true ansible-playbook -v /tmp/bare_metal_lab/cleanup-lab.yaml --skip-tags "clone"
+ANSIBLE_FORCE_COLOR=true ansible-playbook -v "${CI_DIR}"/bare_metal_lab/cleanup-lab.yaml --skip-tags "clone"
diff --git a/jenkins/scripts/bml_integration_test.sh b/jenkins/scripts/bml_integration_test.sh
@@ -37,9 +37,9 @@ CAPM3RELEASEBRANCH="${CAPM3RELEASEBRANCH:-main}"
 BMORELEASEBRANCH="${BMORELEASEBRANCH:-main}"
 BARE_METAL_LAB=true
 
-TEST_EXECUTER_IP="192.168.1.3"
+# TEST_EXECUTER_IP="192.168.1.3"
 
-cat <<-EOF >"${CI_DIR}/files/vars.sh"
+cat <<-EOF >"/tmp/vars.sh"
 REPO_ORG="${REPO_ORG}"
 REPO_NAME="${REPO_NAME}"
 REPO_BRANCH="${REPO_BRANCH}"
@@ -54,43 +54,41 @@ TARGET_NODE_MEMORY="${TARGET_NODE_MEMORY}"
 BARE_METAL_LAB="${BARE_METAL_LAB}"
 EOF
 
-cat "${CI_DIR}/integration_test_env.sh" >>"${CI_DIR}/files/vars.sh"
+cat "${CI_DIR}/integration_test_env.sh" >>"/tmp/vars.sh"
 
-declare -a SSH_OPTIONS=(
-    -o StrictHostKeyChecking=no
-    -o UserKnownHostsFile=/dev/null
-    -o ServerAliveInterval=15
-    -o ServerAliveCountMax=10
-    -i "${METAL3_CI_USER_KEY}"
-)
+# declare -a SSH_OPTIONS=(
+#     -o StrictHostKeyChecking=no
+#     -o UserKnownHostsFile=/dev/null
+#     -o ServerAliveInterval=15
+#     -o ServerAliveCountMax=10
+#     -i "${METAL3_CI_USER_KEY}"
+# )
 
 # Send Remote script to Executer
-scp -r \
-    "${CI_DIR}/files/run_integration_tests.sh" \
-    "${CI_DIR}/files/vars.sh" \
-    "${CI_DIR}/bare_metal_lab/" \
-    "${METAL3_CI_USER}@${TEST_EXECUTER_IP}:/tmp/" >/dev/null
+# scp -r \
+#     "${CI_DIR}/files/run_integration_tests.sh" \
+#     "${CI_DIR}/files/vars.sh" \
+#     "${CI_DIR}/bare_metal_lab/" \
+#     "${METAL3_CI_USER}@${TEST_EXECUTER_IP}:/tmp/" >/dev/null
 
 echo "Setting up the lab"
 # Execute remote script
 # shellcheck disable=SC2029
-ssh \
-    -o SendEnv="BML_ILO_USERNAME" \
-    -o SendEnv="BML_ILO_PASSWORD" \
-    -o SendEnv="GITHUB_TOKEN" \
-    -o SendEnv="REPO_NAME" \
-    -o SendEnv="BML_METAL3_DEV_ENV_REPO" \
-    -o SendEnv="BML_METAL3_DEV_ENV_BRANCH" \
-    -o SendEnv="PR_ID" \
-    "${SSH_OPTIONS[@]}" \
-    "${METAL3_CI_USER}"@"${TEST_EXECUTER_IP}" \
-    ANSIBLE_FORCE_COLOR=true ansible-playbook -v /tmp/bare_metal_lab/deploy-lab.yaml
+# ssh \
+#     -o SendEnv="BML_ILO_USERNAME" \
+#     -o SendEnv="BML_ILO_PASSWORD" \
+#     -o SendEnv="GITHUB_TOKEN" \
+#     -o SendEnv="REPO_NAME" \
+#     -o SendEnv="BML_METAL3_DEV_ENV_REPO" \
+#     -o SendEnv="BML_METAL3_DEV_ENV_BRANCH" \
+#     -o SendEnv="PR_ID" \
+#     "${SSH_OPTIONS[@]}" \
+#     "${METAL3_CI_USER}"@"${TEST_EXECUTER_IP}" \
+
+ANSIBLE_FORCE_COLOR=true ansible-playbook -v "${CI_DIR}"/bare_metal_lab/deploy-lab.yaml
 
 echo "Running the tests"
 # Execute remote script
 # shellcheck disable=SC2029
-ssh \
-    "${SSH_OPTIONS[@]}" \
-    "${METAL3_CI_USER}"@"${TEST_EXECUTER_IP}" \
-    PATH=/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/bin \
-    /tmp/run_integration_tests.sh /tmp/vars.sh "${GITHUB_TOKEN}"
+
+"${CI_DIR}/files/run_integration_tests.sh" "/tmp/vars.sh" "${GITHUB_TOKEN}"