Commit 2b0b0a2f authored by Federico Falconieri's avatar Federico Falconieri
Browse files

fixes conflicts

parent 5ccfa6b3

.gitlab-ci.yml

+0 −8
Original line number Diff line number Diff line
@@ -69,19 +69,11 @@ pipelines:python: 
      - local: tests/pipelines/python.yml

    strategy: depend



<<<<<<< HEAD

pipelines:container:polirepo:

  stage: test

  trigger:

    include:

      - local: tests/pipelines/container/polirepo.yml

=======

pipelines:container:polyrepo:

  stage: test

  trigger:

    include:

      - local: tests/pipelines/container/polyrepo.yml

>>>>>>> main

    strategy: depend



pipelines:container:monorepo:

cd/ssh/clone.yml

+0 −13
Original line number Diff line number Diff line 
---

<<<<<<< HEAD

variables:

  GIT_SUBMODULE_STRATEGY: recursive



clone:

  extends: .ssh

=======

clone:

  extends: .ssh

  GIT_SUBMODULE_STRATEGY: recursive

>>>>>>> main

  script:

    - ssh ${REMOTE_USER}@${REMOTE_HOST} "

        git config --global user.email 'bot@mail.com' &&

        git config --global user.name 'bot' &&

<<<<<<< HEAD

        rm -rf $CI_PROJECT_NAME &&

        git clone --recurse-submodules --branch $CI_COMMIT_REF_NAME --depth 1 https://${DEPLOY_USER}:${DEPLOY_TOKEN}@${CI_SERVER_HOST}/gitlab/${CI_PROJECT_PATH} &&

=======

        rm -rf ${CI_PROJECT_NAME} &&

        git clone --recurse-submodules --branch ${CI_COMMIT_REF_NAME} --depth 1 https://${DEPLOY_USER}:${DEPLOY_TOKEN}@${CI_SERVER_HOST}/gitlab/${CI_PROJECT_PATH} &&

>>>>>>> main

        exit"

cd/ssh/docker-login.yml

+0 −4
Original line number Diff line number Diff line
@@ -2,8 +2,4 @@ 
docker:login:

  extends: .ssh

  script:

<<<<<<< HEAD

    - ssh ${REMOTE_USER}@${REMOTE_HOST} "docker login ${CI_REGISTRY} -u ${DEPLOY_USER} -p ${DEPLOY_TOKEN}"

=======

    - ssh ${REMOTE_USER}@${REMOTE_HOST} -p ${REMOTE_PORT:=22} "docker login ${CI_REGISTRY} -u ${DEPLOY_USER} -p ${DEPLOY_TOKEN}"
 
>>>>>>> main

cd/ssh/scp.yml

+0 −4
Original line number Diff line number Diff line
@@ -3,8 +3,4 @@ scp: 
  extends: .ssh

  stage: deliver

  script:

<<<<<<< HEAD

    - scp -r $CI_PROJECT_DIR ${REMOTE_USER}@${REMOTE_HOST}:${SCP_REMOTE_DEST_DIR} || true

=======

    - scp -r "${CI_PROJECT_DIR}" ${REMOTE_USER}@${REMOTE_HOST}:"${SCP_REMOTE_DEST_DIR}" || true
 
>>>>>>> main

cd/ssh/ssh.yml

+0 −11
Original line number Diff line number Diff line 
---

.ssh:

<<<<<<< HEAD

  image: alpine

  before_script:

    - apk add openssh

    - eval $(ssh-agent -s)

    - echo "$REMOTE_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -

    - mkdir -p ~/.ssh

    - chmod 700 ~/.ssh

    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" >> ~/.ssh/config'

=======

  image: alpine:latest

  before_script:

    - apk add --no-cache openssh
@@ -18,4 +8,3 @@ 
    - mkdir -p ~/.ssh

    - chmod 700 ~/.ssh

    - 'test -f /.dockerenv && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" >> ~/.ssh/config'
 
>>>>>>> main