chore(ci) MCOL-6071 run_cmapi_test.sh

.drone.jsonnet

@@ -93,8 +93,6 @@ local echo_running_on = ["echo running on ${DRONE_STAGE_MACHINE}",
 local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise", customBootstrapParams="", customBuildEnvCommandsMapKey="") = {
   local pkg_format = if (std.split(platform, ":")[0] == "rockylinux") then "rpm" else "deb",
   local mtr_path = if (pkg_format == "rpm") then "/usr/share/mysql-test" else "/usr/share/mysql/mysql-test",
-  local cmapi_path = "/usr/share/columnstore/cmapi",
-  local etc_path = "/etc/columnstore",
   local socket_path = if (pkg_format == "rpm") then "/var/lib/mysql/mysql.sock" else "/run/mysqld/mysqld.sock",
   local img = if (platform == "rockylinux:8") then platform else "detravi/" + std.strReplace(platform, "/", "-"),
   local branch_ref = if (branch == any_branch) then current_branch else branch,
@@ -183,10 +181,6 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
 
   local getContainerName(stepname) = stepname + "$${DRONE_BUILD_NUMBER}",
 
-  local installCmapi(containerName, pkg_format) =
-    if (pkg_format == "deb") then execInnerDocker('bash -c "apt-get clean && apt-get update -y && apt-get install -y mariadb-columnstore-cmapi"', containerName)
-    else execInnerDocker('bash -c "yum update -y && yum install -y MariaDB-columnstore-cmapi"', containerName),
-
   local prepareTestContainer(containerName, result, do_setup) =
     'sh -c "apk add bash && bash /mdb/' + builddir + "/storage/columnstore/columnstore/build/prepare_test_container.sh" +
     " --container-name " + containerName +
@@ -394,17 +388,10 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
     },
     commands: [
       prepareTestContainer(getContainerName("cmapi"), result, true),
-      installCmapi(getContainerName("cmapi"), pkg_format),
+
-      "cd cmapi",
+      'apk add bash && bash /mdb/' + builddir + '/storage/columnstore/columnstore/build/run_cmapi_test.sh' +
-      "for i in mcs_node_control cmapi_server failover; do docker cp $${i}/test cmapi$${DRONE_BUILD_NUMBER}:" + cmapi_path + "/$${i}/; done",
+      ' --container-name ' + getContainerName("cmapi") +
-      "docker cp run_tests.py cmapi$${DRONE_BUILD_NUMBER}:" + cmapi_path + "/",
+      ' --pkg-format ' + pkg_format,
-      execInnerDocker("systemctl start mariadb-columnstore-cmapi", getContainerName("cmapi")),
-      // set API key to /etc/columnstore/cmapi_server.conf
-      execInnerDocker('bash -c "mcs cluster set api-key --key somekey123"', getContainerName("cmapi")),
-      // copy cmapi conf file for test purposes (there are api key already set inside)
-      execInnerDocker('bash -c "cp %s/cmapi_server.conf %s/cmapi_server/"' % [etc_path, cmapi_path], getContainerName("cmapi")),
-      execInnerDocker("systemctl stop mariadb-columnstore-cmapi", getContainerName("cmapi")),
-      execInnerDocker('bash -c "cd ' + cmapi_path + ' && python/bin/python3 run_tests.py"', getContainerName("cmapi")),
     ],
   },
   cmapilog:: {
@@ -520,7 +507,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
                          " " + customBootstrapParams +
                          " " + customBootstrapParamsForExisitingPipelines(platform) + " | " +
                          "/mdb/" + builddir + "/storage/columnstore/columnstore/build/ansi2txt.sh " +
-                         "/mdb/" + builddir + "/" + result + '/build.log "'
+                         "/mdb/" + builddir + "/" + result + '/build.log "',
                        ],
            },
            {

build/run_cmapi_test.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+set -eo pipefail
+
+SCRIPT_LOCATION=$(dirname "$0")
+COLUMNSTORE_SOURCE_PATH=$(realpath "$SCRIPT_LOCATION"/../)
+MDB_SOURCE_PATH=$(realpath "$SCRIPT_LOCATION"/../../../..)
+CMAPI_PATH="/usr/share/columnstore/cmapi"
+ETC_PATH="/etc/columnstore"
+
+source "$SCRIPT_LOCATION"/utils.sh
+
+optparse.define short=c long=container-name desc="Name of the Docker container where cmapi tests will run" variable=CONTAINER_NAME
+optparse.define short=f long=pkg-format desc="Package format" variable=PKG_FORMAT
+source $(optparse.build)
+echo "Arguments received: $@"
+
+for flag in CONTAINER_NAME PKG_FORMAT; do
+  if [[ -z "${!flag}" ]]; then
+    error "Missing required flag: -${flag:0:1} / --${flag,,}"
+    exit 1
+  fi
+done
+
+on_exit() {
+  if [[ $? -eq 0 ]]; then
+    echo "Cmapi tests passed"
+  else
+    echo "Cmapi tests failed!"
+  fi
+}
+trap on_exit EXIT
+
+prepare_environment() {
+  echo "Preparing for cmapi test run..."
+
+  if [[ "$PKG_FORMAT" == "deb" ]]; then
+    execInnerDocker $CONTAINER_NAME "apt-get clean && apt-get update -y && apt-get install -y mariadb-columnstore-cmapi"
+  else
+    execInnerDocker $CONTAINER_NAME "yum update -y && yum install -y MariaDB-columnstore-cmapi"
+  fi
+
+  cd cmapi
+
+  for i in mcs_node_control cmapi_server failover; do
+    docker cp "${i}/test" "$CONTAINER_NAME:${CMAPI_PATH}/${i}/"
+  done
+
+  docker cp run_tests.py "$CONTAINER_NAME:${CMAPI_PATH}/"
+  execInnerDocker $CONTAINER_NAME "systemctl start mariadb-columnstore-cmapi"
+
+  # set API key to /etc/columnstore/cmapi_server.conf
+  execInnerDocker $CONTAINER_NAME "mcs cluster set api-key --key somekey123"
+  # copy cmapi conf file for test purposes (there are api key already set inside)
+  execInnerDocker $CONTAINER_NAME "cp ${ETC_PATH}/cmapi_server.conf ${CMAPI_PATH}/cmapi_server/"
+  execInnerDocker $CONTAINER_NAME "systemctl stop mariadb-columnstore-cmapi"
+}
+
+run_cmapi_test() {
+  execInnerDocker $CONTAINER_NAME "cd ${CMAPI_PATH} && python/bin/python3 run_tests.py"
+}
+
+prepare_environment
+run_cmapi_test