Commit 9e338e39 authored by Nikos Psaromanolakis's avatar Nikos Psaromanolakis
Browse files

Edit .gitlab-ci.yml

parent 77d04c2e

.gitlab-ci.yml

+3 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ dev_workflows_job: 
dev_merge:

  stage: dev_merge

  image:

    name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/alpine:latest

    name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/python-argocd:3.9

    pull_policy: [always, if-not-present]

  script:

    - git config --global user.email "$GITLAB_USER_EMAIL"
@@ -153,7 +153,8 @@ dev_merge: 
    - git merge origin/main -m "Merge changes from main"

    - git push origin gitops-cd

  rules:

    - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'

    - if: '$CI_COMMIT_BRANCH == "main"'

    #- if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'





get_images: