Commit 300b8367 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Mock QKD Node: 

- Corrected GitLab CI/CD pipeline
- Corrected build.sh script
- Corrected Dockerfile
parent 80053007

src/tests/tools/mock_qkd_node/.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ build mock_qkd_node: 
  before_script:

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

  script:

    - docker buildx build -t "$CI_REGISTRY_IMAGE/mock_qkd_node:test" -f ./src/tests/tools/mock_qkd_node/Dockerfile .

    - docker buildx build -t "$CI_REGISTRY_IMAGE/mock-qkd-node:test" -f ./src/tests/tools/mock_qkd_node/Dockerfile ./src/tests/tools/mock_qkd_node

    - docker push "$CI_REGISTRY_IMAGE/mock_qkd_node:test"

  after_script:

    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi
@@ -28,7 +28,7 @@ build mock_qkd_node: 
    - changes:

      - src/common/**/*.py

      - proto/*.proto

      - src/src/tests/tools/mock_qkd_node/**/*.{py,in,yml,yaml}

      - src/src/tests/tools/mock_qkd_node/**/*.{py,in,yml,yaml,yang,sh,json}

      - src/src/tests/tools/mock_qkd_node/Dockerfile

      - src/device/**/*.{py,in,yml}

      - src/device/Dockerfile

src/tests/tools/mock_qkd_node/Dockerfile

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ RUN fc-lang-install -v 
# Create component sub-folders, and copy content

RUN mkdir -p /var/mock_qkd_node/

WORKDIR /var/mock_qkd_node

COPY yang/. yang/



# Copy code and data

COPY ./yang ./yang

COPY ./startup.json ./startup.json

COPY ./qkd_node.py ./qkd_node.py

src/tests/tools/mock_qkd_node/build.sh

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
# Make folder containing the script the root folder for its execution

cd $(dirname $0)



docker build -t mock-qkd-node:test -f Dockerfile .

docker buildx build -t mock-qkd-node:test -f Dockerfile .

#docker tag mock-qkd-node:test localhost:32000/tfs/mock-qkd-node:test

#docker push localhost:32000/tfs/mock-qkd-node:test