[CI] Testing on release branch (#8656)

OpenCTI-Platform · Oct 22, 2024 · ceb1fe5 · ceb1fe5
1 parent 6d54d59
commit ceb1fe5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 41 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -11,7 +11,7 @@ steps:
     commands:
       - apk add git github-cli
       - chmod 777 scripts/*
-      - ./scripts/clone-dependencies.sh ${DRONE_SOURCE_BRANCH} $(pwd) ${DRONE_PULL_REQUEST}
+      - ./scripts/clone-dependencies.sh "${DRONE_SOURCE_BRANCH}" "${DRONE_TARGET_BRANCH}" "$(pwd)" "${DRONE_PULL_REQUEST}"
       - ls -lart
       - cd "$DRONE_WORKSPACE/client-python"
       - echo "[INFO] using client-python on branch $(git branch --show-current)"
@@ -140,7 +140,7 @@ steps:
   - name: build-circleci
     image: curlimages/curl
     commands:
-      - curl -X POST --data "branch=$DRONE_COMMIT_BRANCH" https://circleci.com/api/v1.1/project/github/OpenCTI-Platform/opencti/build?circle-token=$CIRCLECI_TOKEN
+      - curl -X POST --data "branch=master" https://circleci.com/api/v1.1/project/github/OpenCTI-Platform/opencti/build?circle-token=$CIRCLECI_TOKEN
     environment:
       CIRCLECI_TOKEN:
         from_secret: circleci_token

diff --git a/scripts/clone-dependencies.sh b/scripts/clone-dependencies.sh
@@ -1,14 +1,15 @@
 #!/bin/sh
 
-if [[ -z "$1" ]] || [[ -z "$2" ]]
+if [[ -z "$1" ]] || [[ -z "$2" ]] || [[ -z "$3" ]]
 then
-    echo "[CLONE-DEPS] This scripts $0 requires 2 paramaters: branch_name:$1, workspace:$2 (optional: PR_number:$3)"
+    echo "[CLONE-DEPS] This scripts $0 requires 3 parameters: branch_name:$1, pr_target_branch: $2, workspace:$3 (optional: PR_number:$4)"
     exit 0
 fi
 
 PR_BRANCH_NAME=$1
-WORKSPACE=$2
-PR_NUMBER=$3
+PR_TARGET_BRANCH=$2
+WORKSPACE=$3
+PR_NUMBER=$4
 
 
 CLI_PYTHON_DIR="${WORKSPACE}/client-python"
@@ -33,7 +34,7 @@ clone_for_pr_build() {
         # ------
         # For client-python, maybe one day we will refactor to a function.
         echo "[CLONE-DEPS][CLIENT-PYTHON] Multi repository PR, looking for client-python related branch"
-        gh repo clone https://github.com/OpenCTI-Platform/client-python ${CLI_PYTHON_DIR}
+        gh repo clone https://github.com/OpenCTI-Platform/client-python ${CLI_PYTHON_DIR} -- --branch ${PR_TARGET_BRANCH}  --depth=1
         cd ${CLI_PYTHON_DIR}
 
         # search for the first opencti PR that matches OPENCTI_BRANCH
@@ -51,14 +52,14 @@ clone_for_pr_build() {
             gh pr checkout ${CLI_PYTHON_PR_NUMBER}
             pip install -e .
         else
-            echo "[CLONE-DEPS][CLIENT-PYTHON] No PR found in client-python side, keeping client-python:master"
-            # Repository already clone on master branch
+            echo "[CLONE-DEPS][CLIENT-PYTHON] No PR found in client-python side, keeping client-python:${PR_TARGET_BRANCH}"
+            # Repository already clone on PR_TARGET_BRANCH branch
         fi
 
         # ------
         # For connector, maybe one day we will refactor to a function.
         echo "[CLONE-DEPS][CONNECTOR] Multi repository PR, looking for connectors related branch"
-        gh repo clone https://github.com/OpenCTI-Platform/connectors ${CONNECTOR_DIR}
+        gh repo clone https://github.com/OpenCTI-Platform/connectors ${CONNECTOR_DIR}  -- --branch ${PR_TARGET_BRANCH}  --depth=1
         cd ${CONNECTOR_DIR}
 
         # search for the first opencti PR that matches OPENCTI_BRANCH
@@ -75,45 +76,26 @@ clone_for_pr_build() {
             echo "[CLONE-DEPS][CONNECTOR] Found a PR in connectors with number ${CONNECTOR_PR_NUMBER}, using it."
             gh pr checkout ${CONNECTOR_PR_NUMBER}
         else
-            echo "[CLONE-DEPS][CONNECTOR] No PR found in connectors side, keeping connector:master"
-            # Repository already clone on master branch
+            echo "[CLONE-DEPS][CONNECTOR] No PR found in connectors side, keeping connector:${PR_TARGET_BRANCH}"
+            # Repository already clone on PR_TARGET_BRANCH branch
         fi
 
     else
-        echo "[CLONE-DEPS] NOT multi repo, cloning client-python:master and connector:master"
-        gh repo clone https://github.com/OpenCTI-Platform/client-python ${CLI_PYTHON_DIR}
-        gh repo clone https://github.com/OpenCTI-Platform/connectors ${CONNECTOR_DIR}
+        echo "[CLONE-DEPS] NOT multi repo, cloning client-python:${PR_TARGET_BRANCH} and connector:${PR_TARGET_BRANCH}"
+        gh repo clone https://github.com/OpenCTI-Platform/client-python ${CLI_PYTHON_DIR} -- --branch ${PR_TARGET_BRANCH}  --depth=1
+        gh repo clone https://github.com/OpenCTI-Platform/connectors ${CONNECTOR_DIR} -- --branch ${PR_TARGET_BRANCH}  --depth=1
     fi
 }
 
-clone_for_push_build() {
-    echo "[CLONE-DEPS][CLIENT-PYTHON] Build from a commit, checking if a dedicated branch is required."
-    if [[ "$(echo "$(git ls-remote --heads https://github.com/OpenCTI-Platform/client-python.git refs/heads/$PR_BRANCH_NAME)")" != '' ]]
-    then
-        CLIENT_PYTHON_BRANCH=${PR_BRANCH_NAME}
-    else
-        CLIENT_PYTHON_BRANCH=$([[ "$(echo "$(git ls-remote --heads https://github.com/OpenCTI-Platform/client-python.git refs/heads/opencti/$PR_BRANCH_NAME)")" != '' ]] && echo opencti/$PR_BRANCH_NAME || echo 'master')
-    fi
-    git clone -b $CLIENT_PYTHON_BRANCH https://github.com/OpenCTI-Platform/client-python.git ${CLI_PYTHON_DIR}
-
-    echo "[CLONE-DEPS][CONNECTOR] Build from a commit, checking if a dedicated branch is required."
-    if [[ "$(echo "$(git ls-remote --heads https://github.com/OpenCTI-Platform/connectors.git refs/heads/$PR_BRANCH_NAME)")" != '' ]]
-    then
-        CONNECTOR_BRANCH=${PR_BRANCH_NAME}
-    else
-        CONNECTOR_BRANCH=$([[ "$(echo "$(git ls-remote --heads https://github.com/OpenCTI-Platform/connectors.git refs/heads/opencti/$PR_BRANCH_NAME)")" != '' ]] && echo opencti/$PR_BRANCH_NAME || echo 'master')
-    fi
-
-    git clone -b $CONNECTOR_BRANCH https://github.com/OpenCTI-Platform/connectors.git ${CONNECTOR_DIR}
-}
-
-echo "[CLONE-DEPS] START; with PR_BRANCH_NAME=${PR_BRANCH_NAME}, PR_NUMBER=${PR_NUMBER}, OPENCTI_DIR=${OPENCTI_DIR}."
+echo "[CLONE-DEPS] START; with PR_BRANCH_NAME=${PR_BRANCH_NAME},PR_TARGET_BRANCH=${PR_TARGET_BRANCH}, PR_NUMBER=${PR_NUMBER}, OPENCTI_DIR=${OPENCTI_DIR}."
 if [[ -z ${PR_NUMBER} ]] || [[ ${PR_NUMBER} == "" ]]
 then
-    # No PR number from Drone = "Push build". And it's only for repository branch (not fork)
-    # Only check branches from OpenCTI-Platform org
-    echo "[CLONE-DEPS] No PR number from Drone = "Push build"; it's only for repository branch (not fork)."
-    clone_for_push_build
+    # No PR number from Drone = "Push build".
+    # Using github cli to get PR number anyway
+    PR_NUMBER=$(gh pr view ${PR_BRANCH_NAME} --json number --jq '.number')
+    PR_TARGET_BRANCH=$(gh pr view ${PR_BRANCH_NAME} --json baseRefName --jq '.baseRefName')
+    echo "[CLONE-DEPS] Got data from github cli, continue with: PR_TARGET_BRANCH=${PR_TARGET_BRANCH}, PR_NUMBER=${PR_NUMBER}."
+    clone_for_pr_build
 else
     # PR build is trigger from Pull Request coming both from branch and forks.
     # We need to have this clone accross repository that works for forks (community PR)