Commit 10b55260 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'fix/deploy-context-device-service-compute' into 'develop' 

Fix GitLab CI pipeline for Context, Device, Service and Compute components.

See merge request teraflow-h2020/controller!54
parents 84f998e9 137fabca

src/compute/.gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ build compute: 
      - src/$IMAGE_NAME/**/*.{py,in,yml}

      - src/$IMAGE_NAME/Dockerfile

      - src/$IMAGE_NAME/tests/*.py

      - manifests/$IMAGE_NAMEservice.yaml

      - manifests/${IMAGE_NAME}service.yaml

      - .gitlab-ci.yml



# Apply unit test to the component
@@ -52,7 +52,7 @@ unit test compute: 
      - src/$IMAGE_NAME/Dockerfile

      - src/$IMAGE_NAME/tests/*.py

      - src/$IMAGE_NAME/tests/Dockerfile

      - manifests/$IMAGE_NAMEservice.yaml

      - manifests/${IMAGE_NAME}service.yaml

      - .gitlab-ci.yml



# Deployment of the service in Kubernetes Cluster
@@ -65,10 +65,10 @@ deploy compute: 
    - unit test compute

    # - integ_test execute

  script:

    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/$IMAGE_NAMEservice.yaml'

    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/${IMAGE_NAME}service.yaml'

    - kubectl version

    - kubectl get all

    - kubectl apply -f "manifests/$IMAGE_NAMEservice.yaml"

    - kubectl apply -f "manifests/${IMAGE_NAME}service.yaml"

    - kubectl get all

  # environment:

  #   name: test

src/context/.gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ build context: 
      - src/$IMAGE_NAME/**/*.{py,in,yml}

      - src/$IMAGE_NAME/Dockerfile

      - src/$IMAGE_NAME/tests/*.py

      - manifests/$IMAGE_NAMEservice.yaml

      - manifests/${IMAGE_NAME}service.yaml

      - .gitlab-ci.yml



# Apply unit test to the component
@@ -56,7 +56,7 @@ unit test context: 
      - src/$IMAGE_NAME/Dockerfile

      - src/$IMAGE_NAME/tests/*.py

      - src/$IMAGE_NAME/tests/Dockerfile

      - manifests/$IMAGE_NAMEservice.yaml

      - manifests/${IMAGE_NAME}service.yaml

      - .gitlab-ci.yml



# Deployment of the service in Kubernetes Cluster
@@ -69,10 +69,10 @@ deploy context: 
    - unit test context

    # - integ_test execute

  script:

    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/$IMAGE_NAMEservice.yaml'

    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/${IMAGE_NAME}service.yaml'

    - kubectl version

    - kubectl get all

    - kubectl apply -f "manifests/$IMAGE_NAMEservice.yaml"

    - kubectl apply -f "manifests/${IMAGE_NAME}service.yaml"

    - kubectl get all

  # environment:

  #   name: test

src/device/.gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ build device: 
      - src/$IMAGE_NAME/**/*.{py,in,yml}

      - src/$IMAGE_NAME/Dockerfile

      - src/$IMAGE_NAME/tests/*.py

      - manifests/$IMAGE_NAMEservice.yaml

      - manifests/${IMAGE_NAME}service.yaml

      - .gitlab-ci.yml



# Apply unit test to the component
@@ -52,7 +52,7 @@ unit test device: 
      - src/$IMAGE_NAME/Dockerfile

      - src/$IMAGE_NAME/tests/*.py

      - src/$IMAGE_NAME/tests/Dockerfile

      - manifests/$IMAGE_NAMEservice.yaml

      - manifests/${IMAGE_NAME}service.yaml

      - .gitlab-ci.yml



# Deployment of the service in Kubernetes Cluster
@@ -65,10 +65,10 @@ deploy device: 
    - unit test device

    # - integ_test execute

  script:

    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/$IMAGE_NAMEservice.yaml'

    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/${IMAGE_NAME}service.yaml'

    - kubectl version

    - kubectl get all

    - kubectl apply -f "manifests/$IMAGE_NAMEservice.yaml"

    - kubectl apply -f "manifests/${IMAGE_NAME}service.yaml"

    - kubectl get all

  # environment:

  #   name: test

src/service/.gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ build service: 
      - src/$IMAGE_NAME/**/*.{py,in,yml}

      - src/$IMAGE_NAME/Dockerfile

      - src/$IMAGE_NAME/tests/*.py

      - manifests/$IMAGE_NAMEservice.yaml

      - manifests/${IMAGE_NAME}service.yaml

      - .gitlab-ci.yml



# Apply unit test to the component
@@ -52,7 +52,7 @@ unit test service: 
      - src/$IMAGE_NAME/Dockerfile

      - src/$IMAGE_NAME/tests/*.py

      - src/$IMAGE_NAME/tests/Dockerfile

      - manifests/$IMAGE_NAMEservice.yaml

      - manifests/${IMAGE_NAME}service.yaml

      - .gitlab-ci.yml



# Deployment of the service in Kubernetes Cluster
@@ -65,10 +65,10 @@ deploy service: 
    - unit test service

    # - integ_test execute

  script:

    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/$IMAGE_NAMEservice.yaml'

    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/${IMAGE_NAME}service.yaml'

    - kubectl version

    - kubectl get all

    - kubectl apply -f "manifests/$IMAGE_NAMEservice.yaml"

    - kubectl apply -f "manifests/${IMAGE_NAME}service.yaml"

    - kubectl get all

  # environment:

  #   name: test

manifests/monitoringservice.yaml

+1 −1

File changed.

Contains only whitespace changes.