Commit 234855e1 authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

k8s-configuration: moved pipeline execution to minikube

parent 8b61abca

csp-lmc-mid/.gitlab-ci.yml

+5 −8
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ build:csp-lmc-mid_image: 
    - cd $BUILD_PATH      

    - make build

  variables:

    BUILD_PATH: csp-lmc-mid/docker

    BUILD_PATH: csp-lmc-mid



# test:csp-lmc-mid:

#  stage: test
@@ -76,23 +76,20 @@ build:csp-lmc-mid_image: 
#



.test:

  image: nexus.engageska-portugal.pt/ska-docker/tango-builder:latest

  before_script:

    - docker login -u $DOCKER_REGISTRY_USERNAME -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY_HOST

  tags:

    - docker-executor

    - minikube 

  artifacts:

    paths:

      - ./$BUILD_PATH/build/

  variables:

    BUILD_PATH: csp-lmc-mid/docker

    BUILD_PATH: csp-lmc-mid



test:csp-lmc-mid:

  extends: .test

  stage: test

  script:

    - cd $BUILD_PATH  

    - make test

    - make k8s_test



# linting stage

.linting:
@@ -171,4 +168,4 @@ release csp-lmc-mid image: 
    refs:

      - master

  variables:

    BUILD_PATH: csp-lmc-mid/docker
 
    BUILD_PATH: csp-lmc-mid

csp-lmc-mid/.make/k8s.mk

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ kubeconfig: ## export current KUBECONFIG as base64 ready for KUBE_CONFIG_BASE64 
wait:

	@echo "Waiting for device servers to be ready"

	@date

	@kubectl -n $(KUBE_NAMESPACE) get pods -l tangoServer

	@kubectl -n $(KUBE_NAMESPACE) get pods -l cspServer

	@kubectl -n $(KUBE_NAMESPACE) wait --for=condition=ready --timeout=120s -l cspServer pods

	@date

csp-lmc-mid/tests/acceptance_tests/test_ConfigureScan_ADR4.json

+1 −1
Original line number Diff line number Diff line 
{

    "id": "sbi-mvp01-20200325-00002-science_A",

    "frequencyBand": "1",

    "delayModelSubscriptionPoint": "ska_mid/tm_leaf_node/csp_subarray_01/delayModel",

    "delayModelSubscriptionPoint": "ska_mid/tm_leaf_node/csp_subarray01/delayModel",



    "fsp": [

        {

csp-lmc-mid/tests/acceptance_tests/test_ConfigureScan_basic.json

+2 −3
Original line number Diff line number Diff line
@@ -5,9 +5,8 @@ 
    "band5Tuning": [5.85, 7.25],

    "frequencyBandOffsetStream1": 0,

    "frequencyBandOffsetStream2": 0,

    "dopplerPhaseCorrSubscriptionPoint": "ska_mid/tm_leaf_node/csp_subarray_01/dopplerPhaseCorrection",

    "delayModelSubscriptionPoint": "ska_mid/tm_leaf_node/csp_subarray_01/delayModel",

    "visDestinationAddressSubscriptionPoint": "ska_mid/tm_leaf_node/csp_subarray_01/visDestinationAddress",

    "dopplerPhaseCorrSubscriptionPoint": "ska_mid/tm_leaf_node/csp_subarray01/dopplerPhaseCorrection",

    "delayModelSubscriptionPoint": "ska_mid/tm_leaf_node/csp_subarray01/delayModel",

    "rfiFlaggingMask": {},

    "searchWindow": [

        {

csp-lmc-mid/tests/unit/midcspsubarray_unit_test.py

+2 −6
Original line number Diff line number Diff line
@@ -717,12 +717,8 @@ def test_midcspsubarray_obsstate_WHEN_abort_invoked_in_resetting(): 
            tango_context.device.ObsReset()

            prober_obs_state = Probe(tango_context.device, 'obsState', ObsState.RESETTING, f"Wrong CspSubarray state")

            Poller(3, 0.1).check(prober_obs_state)

            with pytest.raises(tango.DevFailed) as df:

            tango_context.device.Abort()

            if df:

                err_msg = str(df.value.args[0].desc)

            assert "Error executing command AbortCommand" in err_msg

            prober_obs_state = Probe(tango_context.device, 'obsState', ObsState.FAULT, f"Wrong CspSubarray state")

            prober_obs_state = Probe(tango_context.device, 'obsState', ObsState.ABORTING, f"Wrong CspSubarray state")

            Poller(3, 0.1).check(prober_obs_state)



def test_midcspsubarray_obsstate_WHEN_restart_invoked_after_cspsubarray_aborted():