Commit 3c3954b2 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

CI/CD pipeline: 

- Fixed execution of OFC'22 tests
parent 9ae8c325

deploy/crdb.sh

+13 −6
Original line number Diff line number Diff line
@@ -158,12 +158,19 @@ function crdb_undeploy_single() { 


function crdb_drop_database_single() {

    echo "Drop database if exists"



    if [[ -z "${GITLAB_CI}" ]]; then

        #kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o yaml

    CRDB_HOST_SQL=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.clusterIP}')

    echo "CRDB_HOST_SQL=${CRDB_HOST_SQL}"

    CRDB_PORT_SQL=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

    echo "CRDB_PORT_SQL=${CRDB_PORT_SQL}"

    CRDB_CLIENT_URL="postgresql://${CRDB_USERNAME}:${CRDB_PASSWORD}@${CRDB_HOST_SQL}:${CRDB_PORT_SQL}/defaultdb?sslmode=require"

        CRDB_HOST=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.clusterIP}')

        CRDB_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

    else

        CRDB_HOST="127.0.0.1"

        CRDB_PORT=${CRDB_EXT_PORT_SQL}

    fi



    echo "CRDB_HOST=${CRDB_HOST}"

    echo "CRDB_PORT=${CRDB_PORT}"

    CRDB_CLIENT_URL="postgresql://${CRDB_USERNAME}:${CRDB_PASSWORD}@${CRDB_HOST}:${CRDB_PORT}/defaultdb?sslmode=require"

    echo "CRDB_CLIENT_URL=${CRDB_CLIENT_URL}"

    kubectl exec -it --namespace ${CRDB_NAMESPACE} cockroachdb-0 -- \

        ./cockroach sql --certs-dir=/cockroach/cockroach-certs --url=${CRDB_CLIENT_URL} \

deploy/qdb.sh

+11 −3
Original line number Diff line number Diff line
@@ -161,11 +161,19 @@ function qdb_undeploy() { 


function qdb_drop_tables() {

    echo "Drop tables, if exist"



    if [[ -z "${GITLAB_CI}" ]]; then

        #kubectl --namespace ${QDB_NAMESPACE} get service questdb-public -o yaml

        QDB_HOST=$(kubectl --namespace ${QDB_NAMESPACE} get service questdb-public -o 'jsonpath={.spec.clusterIP}')

    echo "QDB_HOST=${QDB_HOST}"

        QDB_PORT=$(kubectl --namespace ${QDB_NAMESPACE} get service questdb-public -o 'jsonpath={.spec.ports[?(@.name=="http")].port}')

    else

        QDB_HOST="127.0.0.1"

        QDB_PORT=${QDB_EXT_PORT_HTTP}

    fi



    echo "QDB_HOST=${QDB_HOST}"

    echo "QDB_PORT=${QDB_PORT}"



    curl "http://${QDB_HOST}:${QDB_PORT}/exec?fmt=json&query=DROP+TABLE+IF+EXISTS+${QDB_TABLE_MONITORING_KPIS}+;"

    echo

    curl "http://${QDB_HOST}:${QDB_PORT}/exec?fmt=json&query=DROP+TABLE+IF+EXISTS+${QDB_TABLE_SLICE_GROUPS}+;"

src/tests/ofc22/.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -40,9 +40,11 @@ build ofc22: 
end2end ofc22:

  variables:

    TEST_NAME: 'ofc22'

    IMAGE_TAG: 'latest'

  stage: end2end_test

  before_script:

    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

    - docker pull "$CI_REGISTRY_IMAGE/${TEST_NAME}:$IMAGE_TAG"

  script:

    # Check MicroK8s is ready

    - microk8s status --wait-ready