Skip to content
Snippets Groups Projects
Commit 724b294c authored by Lorenzo Pagliai's avatar Lorenzo Pagliai
Browse files

Update .gitlab-ci.yml file

parent 826b25a7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
.gitlab-ci.yml
+ 0
− 4
View file @ 724b294c
...@@ -9,11 +9,7 @@ variables: ...@@ -9,11 +9,7 @@ variables:
CI_IMAGES_BASEPATH: "git.seco.com:5050/edgehog/yocto_ng/" CI_IMAGES_BASEPATH: "git.seco.com:5050/edgehog/yocto_ng/"
CI_IMAGES_PATH: ${CI_IMAGES_BASEPATH}/seco-manifest/python3.9 CI_IMAGES_PATH: ${CI_IMAGES_BASEPATH}/seco-manifest/python3.9
CI_IMAGES_REV: latest CI_IMAGES_REV: latest
<<<<<<< HEAD
CI_IMAGE_PYTHON: "git.seco.com:5050/edgehog/yocto_ng/seco-manifest/python3.9:${CI_IMAGES_REV}" CI_IMAGE_PYTHON: "git.seco.com:5050/edgehog/yocto_ng/seco-manifest/python3.9:${CI_IMAGES_REV}"
=======
CI_IMAGE_PYTHON: "git.seco.com:5050/edgehog/yocto_ng/seco-manifest/python3.9:CI_IMAGES_REV"
>>>>>>> b679bc717765558814e0e1a6855bab5941d17255
CI_IMAGE_YOCTO: "${CI_IMAGES_PATH}/yocto-build/ubuntu-20.04:${CI_IMAGES_REVISION}" CI_IMAGE_YOCTO: "${CI_IMAGES_PATH}/yocto-build/ubuntu-20.04:${CI_IMAGES_REVISION}"
image: "${CI_IMAGE_PYTHON}" #secodocker/manifest-test:vtemp # image: "${CI_IMAGE_PYTHON}" #secodocker/manifest-test:vtemp #
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment