From 6df75ce4af6458abc7858f1e728899c6ebb3b43f Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Thu, 10 Dec 2020 11:56:11 +0100 Subject: [PATCH 01/37] Add new file --- .gitlab-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..1d89b58 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,14 @@ +# This file is a template, and might need editing before it works on your project. +# see https://docs.gitlab.com/ee/ci/yaml/README.html for all available options + +deploy_staging: +type: deploy +environment: + name: staging + url: migale.inrae.fr +script: + - ssh migale.inrae.fr + - cd /project/florilege/wf + - git checkout master && git pull origin master +only: + - master \ No newline at end of file -- GitLab From f0fce5f3d7dc9937c9be5936a5f804296efefaca Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Thu, 10 Dec 2020 15:19:54 +0100 Subject: [PATCH 02/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d89b58..ef15d8c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,14 +1,15 @@ # This file is a template, and might need editing before it works on your project. # see https://docs.gitlab.com/ee/ci/yaml/README.html for all available options + deploy_staging: -type: deploy -environment: - name: staging - url: migale.inrae.fr -script: - - ssh migale.inrae.fr - - cd /project/florilege/wf - - git checkout master && git pull origin master -only: - - master \ No newline at end of file + type: deploy + environment: + name: staging + url: migale.inrae.fr + script: + - ssh migale.inrae.fr + - cd /project/florilege/wf + - git checkout master && git pull origin master + only: + - master \ No newline at end of file -- GitLab From 0a6cfe7cd38735e02309f8ea5cd44f24ed259399 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Thu, 10 Dec 2020 17:08:51 +0100 Subject: [PATCH 03/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef15d8c..0dd7431 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,4 +12,5 @@ deploy_staging: - cd /project/florilege/wf - git checkout master && git pull origin master only: - - master \ No newline at end of file + - master + - 20-ci-deploiement-du-workflow \ No newline at end of file -- GitLab From 18da2db3c8ee5f9a12b8f1ad8974e804754b0682 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Thu, 10 Dec 2020 17:15:20 +0100 Subject: [PATCH 04/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0dd7431..f116851 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,15 @@ # This file is a template, and might need editing before it works on your project. # see https://docs.gitlab.com/ee/ci/yaml/README.html for all available options +before_script: + - apt-get update -qq + - apt-get install -qq git + # Setup SSH deploy keys + - 'which ssh-agent || ( apt-get install -qq openssh-client )' + - eval $(ssh-agent -s) + - ssh-add <(echo "$SSH_PRIVATE_KEY") + - mkdir -p ~/.ssh + - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' deploy_staging: type: deploy @@ -9,7 +18,7 @@ deploy_staging: url: migale.inrae.fr script: - ssh migale.inrae.fr - - cd /project/florilege/wf + - cd /home/mba/work/ci-test - git checkout master && git pull origin master only: - master -- GitLab From 1a3a34083613cbb2e6b1b5833f3c2df356944912 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Thu, 10 Dec 2020 17:19:34 +0100 Subject: [PATCH 05/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f116851..5b341e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,7 @@ before_script: - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + deploy_staging: type: deploy environment: -- GitLab From dc878e0bae5674684eea1d77657071b99addd05b Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Thu, 10 Dec 2020 17:23:33 +0100 Subject: [PATCH 06/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b341e1..1f6d98e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ before_script: - 'which ssh-agent || ( apt-get install -qq openssh-client )' - eval $(ssh-agent -s) - ssh-add <(echo "$SSH_PRIVATE_KEY") + - ssh-add <(echo "$MY_VAR") - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' -- GitLab From 813c2035cba129f841ffe4b459416b15e76cb45b Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Thu, 10 Dec 2020 17:28:34 +0100 Subject: [PATCH 07/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f6d98e..5b341e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,6 @@ before_script: - 'which ssh-agent || ( apt-get install -qq openssh-client )' - eval $(ssh-agent -s) - ssh-add <(echo "$SSH_PRIVATE_KEY") - - ssh-add <(echo "$MY_VAR") - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' -- GitLab From c210764080b57c77cedc001fbdc4ef609234e2ae Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 11 Dec 2020 10:53:10 +0100 Subject: [PATCH 08/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b341e1..ba77572 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ deploy_staging: name: staging url: migale.inrae.fr script: - - ssh migale.inrae.fr + - ssh -T migale.inrae.fr - cd /home/mba/work/ci-test - git checkout master && git pull origin master only: -- GitLab From 50d05ea7cbd5ca3e79973a0918649dd1a82690db Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 11 Dec 2020 12:37:44 +0100 Subject: [PATCH 09/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba77572..cc3f4a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ deploy_staging: name: staging url: migale.inrae.fr script: - - ssh -T migale.inrae.fr + - ssh -T migale.jouy.inrae.fr - cd /home/mba/work/ci-test - git checkout master && git pull origin master only: -- GitLab From 47b359e8471ab38e68d1ac49fe11f50c61692583 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 11 Dec 2020 12:46:18 +0100 Subject: [PATCH 10/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc3f4a3..73b37b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,14 +2,33 @@ # see https://docs.gitlab.com/ee/ci/yaml/README.html for all available options before_script: - - apt-get update -qq - - apt-get install -qq git - # Setup SSH deploy keys - - 'which ssh-agent || ( apt-get install -qq openssh-client )' + ## + ## Install ssh-agent if not already installed, it is required by Docker. + ## (change apt-get to yum if you use an RPM-based image) + ## + - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )' + ## + ## Run ssh-agent (inside the build environment) + ## - eval $(ssh-agent -s) - - ssh-add <(echo "$SSH_PRIVATE_KEY") + ## + ## Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store + ## We're using tr to fix line endings which makes ed25519 keys work + ## without extra base64 encoding. + ## https://gitlab.com/gitlab-examples/ssh-private-key/issues/1#note_48526556 + ## + - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - + ## + ## Create the SSH directory and give it the right permissions + ## - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + - chmod 700 ~/.ssh + ## + ## Optionally, if you will be using any Git commands, set the user name and + ## and email. + ## + # - git config --global user.email "user@example.com" + # - git config --global user.name "User name" deploy_staging: -- GitLab From 0b473f27c4d0963cebac5206de2ce2dfc6f4edb0 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 11 Dec 2020 12:50:06 +0100 Subject: [PATCH 11/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73b37b3..36bdab6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,13 @@ before_script: - mkdir -p ~/.ssh - chmod 700 ~/.ssh ## + ## Use ssh-keyscan to scan the keys of your private server. Replace gitlab.com + ## with your own domain name. You can copy and repeat that command if you have + ## more than one server to connect to. + ## + - ssh-keyscan migale.jouy.inrae.fr >> ~/.ssh/known_hosts + - chmod 644 ~/.ssh/known_hosts + ## ## Optionally, if you will be using any Git commands, set the user name and ## and email. ## -- GitLab From c146ee2f6aba8c3301ceee8ef622781359dc02a9 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 11 Dec 2020 12:51:49 +0100 Subject: [PATCH 12/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36bdab6..dcd79e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,9 +42,9 @@ deploy_staging: type: deploy environment: name: staging - url: migale.inrae.fr + url: migale.jouy.inrae.fr script: - - ssh -T migale.jouy.inrae.fr + - ssh migale.jouy.inrae.fr - cd /home/mba/work/ci-test - git checkout master && git pull origin master only: -- GitLab From b0e65d1cf0a9727abb328400dc5637429e9d5e77 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 11 Dec 2020 12:54:28 +0100 Subject: [PATCH 13/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dcd79e1..3430c2f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,8 @@ # This file is a template, and might need editing before it works on your project. # see https://docs.gitlab.com/ee/ci/yaml/README.html for all available options +image: ubuntu + before_script: ## ## Install ssh-agent if not already installed, it is required by Docker. -- GitLab From e803ac936dfd8148085d6203675b6c9e6cd5e6f3 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 11 Dec 2020 12:57:04 +0100 Subject: [PATCH 14/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3430c2f..c0d568f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,6 +46,8 @@ deploy_staging: name: staging url: migale.jouy.inrae.fr script: + - cat ~/.ssh/id_rsa + - cat ~/.ssh/known_hosts - ssh migale.jouy.inrae.fr - cd /home/mba/work/ci-test - git checkout master && git pull origin master -- GitLab From 87c27ed2a695a3f6708052b09a7a4e31100223ee Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 11 Dec 2020 12:58:40 +0100 Subject: [PATCH 15/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c0d568f..3430c2f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,8 +46,6 @@ deploy_staging: name: staging url: migale.jouy.inrae.fr script: - - cat ~/.ssh/id_rsa - - cat ~/.ssh/known_hosts - ssh migale.jouy.inrae.fr - cd /home/mba/work/ci-test - git checkout master && git pull origin master -- GitLab From bd4364b6cd7f63ed2dba6ccd4afb48c12cbcb831 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 11 Dec 2020 13:01:40 +0100 Subject: [PATCH 16/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3430c2f..9f619dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,6 @@ # This file is a template, and might need editing before it works on your project. # see https://docs.gitlab.com/ee/ci/yaml/README.html for all available options -image: ubuntu - before_script: ## ## Install ssh-agent if not already installed, it is required by Docker. @@ -19,7 +17,7 @@ before_script: ## without extra base64 encoding. ## https://gitlab.com/gitlab-examples/ssh-private-key/issues/1#note_48526556 ## - - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - + - ssh-add <(echo "$SSH_PRIVATE_KEY") ## ## Create the SSH directory and give it the right permissions ## -- GitLab From 87b92f452301a786f4cb342899b43b248f596193 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 11 Dec 2020 13:17:39 +0100 Subject: [PATCH 17/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f619dd..98932a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,10 +13,6 @@ before_script: - eval $(ssh-agent -s) ## ## Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store - ## We're using tr to fix line endings which makes ed25519 keys work - ## without extra base64 encoding. - ## https://gitlab.com/gitlab-examples/ssh-private-key/issues/1#note_48526556 - ## - ssh-add <(echo "$SSH_PRIVATE_KEY") ## ## Create the SSH directory and give it the right permissions @@ -44,7 +40,7 @@ deploy_staging: name: staging url: migale.jouy.inrae.fr script: - - ssh migale.jouy.inrae.fr + - ssh -T migale.jouy.inrae.fr - cd /home/mba/work/ci-test - git checkout master && git pull origin master only: -- GitLab From a2a890633061255a54b414671a9592b99fa0aeaf Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 11 Dec 2020 13:39:12 +0100 Subject: [PATCH 18/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98932a9..88cdfc8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,7 @@ before_script: ## ## Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store - ssh-add <(echo "$SSH_PRIVATE_KEY") + - pwd ## ## Create the SSH directory and give it the right permissions ## -- GitLab From 3ba40cab4c64c69b63c5e8b79195fb6feccdb7fc Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 11 Dec 2020 13:40:08 +0100 Subject: [PATCH 19/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88cdfc8..dc3f421 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ before_script: ## ## Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store - ssh-add <(echo "$SSH_PRIVATE_KEY") - - pwd + - echo ${HOME} ## ## Create the SSH directory and give it the right permissions ## -- GitLab From 59c2644e17b10da2a38ed00651f11ac8993251fd Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 11 Dec 2020 14:15:02 +0100 Subject: [PATCH 20/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc3f421..576d3dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ before_script: ## with your own domain name. You can copy and repeat that command if you have ## more than one server to connect to. ## - - ssh-keyscan migale.jouy.inrae.fr >> ~/.ssh/known_hosts + - ssh-keyscan root@migale.jouy.inrae.fr >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts ## ## Optionally, if you will be using any Git commands, set the user name and -- GitLab From 828ce6123820063ea1fc6f96bc59e6fc1b41873a Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 11 Dec 2020 14:16:23 +0100 Subject: [PATCH 21/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 576d3dd..d325217 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ before_script: ## with your own domain name. You can copy and repeat that command if you have ## more than one server to connect to. ## - - ssh-keyscan root@migale.jouy.inrae.fr >> ~/.ssh/known_hosts + - ssh-keyscan migale.jouy.inrae.fr >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts ## ## Optionally, if you will be using any Git commands, set the user name and @@ -41,7 +41,7 @@ deploy_staging: name: staging url: migale.jouy.inrae.fr script: - - ssh -T migale.jouy.inrae.fr + - ssh -T root@migale.jouy.inrae.fr - cd /home/mba/work/ci-test - git checkout master && git pull origin master only: -- GitLab From 1759bd845beea74009d30439c8036ea6b2ae0fab Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 11 Dec 2020 14:17:15 +0100 Subject: [PATCH 22/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d325217..dc3f421 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,7 +41,7 @@ deploy_staging: name: staging url: migale.jouy.inrae.fr script: - - ssh -T root@migale.jouy.inrae.fr + - ssh -T migale.jouy.inrae.fr - cd /home/mba/work/ci-test - git checkout master && git pull origin master only: -- GitLab From 34c3040598a31d136f49d7280f9d5a6a0dd5c74b Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Mon, 14 Dec 2020 17:06:39 +0100 Subject: [PATCH 23/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc3f421..5688641 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,6 @@ before_script: ## ## Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store - ssh-add <(echo "$SSH_PRIVATE_KEY") - - echo ${HOME} ## ## Create the SSH directory and give it the right permissions ## @@ -35,6 +34,7 @@ before_script: # - git config --global user.name "User name" + deploy_staging: type: deploy environment: -- GitLab From 5353e85116378223a39cb7df0abc5fc1fb2118ed Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Thu, 7 Jan 2021 15:34:10 +0100 Subject: [PATCH 24/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5688641..146b7cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,12 @@ # This file is a template, and might need editing before it works on your project. # see https://docs.gitlab.com/ee/ci/yaml/README.html for all available options + +image: alpine +variables: + USER: "mba" + HOST: "migale.jouy.inrae.fr" + before_script: ## ## Install ssh-agent if not already installed, it is required by Docker. @@ -41,9 +47,9 @@ deploy_staging: name: staging url: migale.jouy.inrae.fr script: - - ssh -T migale.jouy.inrae.fr + - ssh -T $USER@$HOST - cd /home/mba/work/ci-test - git checkout master && git pull origin master only: - master - - 20-ci-deploiement-du-workflow \ No newline at end of file + - 20-ci-deploiement-du-workflow -- GitLab From 4d9b6d9f677d91be778259f961303a6057986815 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Thu, 7 Jan 2021 15:37:00 +0100 Subject: [PATCH 25/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 146b7cf..d575126 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,6 @@ # This file is a template, and might need editing before it works on your project. # see https://docs.gitlab.com/ee/ci/yaml/README.html for all available options - -image: alpine variables: USER: "mba" HOST: "migale.jouy.inrae.fr" -- GitLab From 5065acef2e807031a97a7835883a7aa482c89552 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 8 Jan 2021 11:06:59 +0100 Subject: [PATCH 26/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d575126..83d7b23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,46 +1,12 @@ # This file is a template, and might need editing before it works on your project. # see https://docs.gitlab.com/ee/ci/yaml/README.html for all available options -variables: - USER: "mba" - HOST: "migale.jouy.inrae.fr" - -before_script: - ## - ## Install ssh-agent if not already installed, it is required by Docker. - ## (change apt-get to yum if you use an RPM-based image) - ## - - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )' - ## - ## Run ssh-agent (inside the build environment) - ## - - eval $(ssh-agent -s) - ## - ## Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store - - ssh-add <(echo "$SSH_PRIVATE_KEY") - ## - ## Create the SSH directory and give it the right permissions - ## - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - ## - ## Use ssh-keyscan to scan the keys of your private server. Replace gitlab.com - ## with your own domain name. You can copy and repeat that command if you have - ## more than one server to connect to. - ## - - ssh-keyscan migale.jouy.inrae.fr >> ~/.ssh/known_hosts - - chmod 644 ~/.ssh/known_hosts - ## - ## Optionally, if you will be using any Git commands, set the user name and - ## and email. - ## - # - git config --global user.email "user@example.com" - # - git config --global user.name "User name" - deploy_staging: type: deploy + tags: + - migale environment: name: staging url: migale.jouy.inrae.fr -- GitLab From 67344cf2811d4daac170623ed6968f65b14da812 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 8 Jan 2021 11:07:29 +0100 Subject: [PATCH 27/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83d7b23..c828ffb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,9 +11,7 @@ deploy_staging: name: staging url: migale.jouy.inrae.fr script: - - ssh -T $USER@$HOST - - cd /home/mba/work/ci-test - - git checkout master && git pull origin master + - ssh only: - master - 20-ci-deploiement-du-workflow -- GitLab From b4461989dd66a3aafb2d16a02d41b56349e5ef78 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 8 Jan 2021 11:07:42 +0100 Subject: [PATCH 28/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c828ffb..6697a05 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ deploy_staging: name: staging url: migale.jouy.inrae.fr script: - - ssh + - times only: - master - 20-ci-deploiement-du-workflow -- GitLab From 77fe8aee3b1d28df198bb313212ac458f8108ed6 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 8 Jan 2021 11:08:43 +0100 Subject: [PATCH 29/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6697a05..08d6382 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ deploy_staging: name: staging url: migale.jouy.inrae.fr script: - - times + - date only: - master - 20-ci-deploiement-du-workflow -- GitLab From af973ef716734237951ea3c1a9758ad4cecaa4fa Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 8 Jan 2021 11:08:59 +0100 Subject: [PATCH 30/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08d6382..0a82047 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,9 +7,6 @@ deploy_staging: type: deploy tags: - migale - environment: - name: staging - url: migale.jouy.inrae.fr script: - date only: -- GitLab From 3e9ccf69263dbbf0f71c0c694e81f53e49ba39d5 Mon Sep 17 00:00:00 2001 From: Damien Berry Date: Fri, 8 Jan 2021 11:18:32 +0100 Subject: [PATCH 31/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a82047..512b1e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,8 @@ deploy_staging: type: deploy - tags: - - migale + #tags: + # - migale script: - date only: -- GitLab From 9b4d27fb2aec8ea7b55d8dab85dd1af5046a65b1 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 8 Jan 2021 11:52:54 +0100 Subject: [PATCH 32/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 512b1e1..afa68fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,8 @@ # This file is a template, and might need editing before it works on your project. # see https://docs.gitlab.com/ee/ci/yaml/README.html for all available options - +varibales: + GIT_STRATEGY: none deploy_staging: type: deploy -- GitLab From 8fa8b868cce6dc4374869be48e160865f878e254 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 8 Jan 2021 11:53:40 +0100 Subject: [PATCH 33/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index afa68fd..ea28caa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # This file is a template, and might need editing before it works on your project. # see https://docs.gitlab.com/ee/ci/yaml/README.html for all available options -varibales: +variables: GIT_STRATEGY: none deploy_staging: -- GitLab From 2e41924659f0a7aa0c26cb04882cfd646ac97d47 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 8 Jan 2021 11:54:40 +0100 Subject: [PATCH 34/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea28caa..2180201 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,8 +6,8 @@ variables: deploy_staging: type: deploy - #tags: - # - migale + tags: + - migale script: - date only: -- GitLab From cd419d7106fb537c9848e849a0b4479f7c37c093 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 8 Jan 2021 12:03:44 +0100 Subject: [PATCH 35/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2180201..082051a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,8 @@ deploy_staging: tags: - migale script: + - cd /projet/florilege/Workflow + - pwd - date only: - master -- GitLab From f43ea5d45721e4dbde18bf7e10ceb24a51b8ca77 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 8 Jan 2021 14:03:00 +0100 Subject: [PATCH 36/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 082051a..2ce37e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,11 +6,9 @@ variables: deploy_staging: type: deploy - tags: - - migale +# tags: +# - migale script: - - cd /projet/florilege/Workflow - - pwd - date only: - master -- GitLab From 90abefcbcd909ea5e70a1f8a346c4c2accc72130 Mon Sep 17 00:00:00 2001 From: Mouhamadou Ba Date: Fri, 8 Jan 2021 14:04:14 +0100 Subject: [PATCH 37/37] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ce37e1..d436220 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,4 +12,3 @@ deploy_staging: - date only: - master - - 20-ci-deploiement-du-workflow -- GitLab