From fd077ebb770e1b3165aa8470be2ceb507c6cfdc9 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 16:21:17 +0100 Subject: [PATCH 01/21] test variable in ci script --- .gitlab-ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42177db..ab53021 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,11 +2,17 @@ stages: - hello - build +tags: + - hottis + - linux + - debian + job1: stage: hello script: - echo "Hallo" - echo "Welt" + - echo "$SSH_PRIVATE_KEY" job2: stage: hello @@ -16,10 +22,6 @@ job2: job3: stage: build - tags: - - hottis - - linux - - debian only: refs: - master From 278e44acbb45cc612ebf9f514aeb70cafa9b7d0c Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 16:23:41 +0100 Subject: [PATCH 02/21] test variable in ci script --- .gitlab-ci.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab53021..667987d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,13 +2,12 @@ stages: - hello - build -tags: - - hottis - - linux - - debian - job1: stage: hello + tags: + - hottis + - linux + - debian script: - echo "Hallo" - echo "Welt" @@ -16,12 +15,20 @@ job1: job2: stage: hello + tags: + - hottis + - linux + - debian script: - echo "Hello" - echo "World" job3: stage: build + tags: + - hottis + - linux + - debian only: refs: - master From 9b5003e4d251457a304e8b9f24ca54519f7fa0a4 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 16:28:21 +0100 Subject: [PATCH 03/21] use ssh in ci script --- .gitlab-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 667987d..b213ee2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,6 @@ job1: script: - echo "Hallo" - echo "Welt" - - echo "$SSH_PRIVATE_KEY" job2: stage: hello @@ -39,6 +38,12 @@ job3: - apt install -y msp430-libc - apt install -y binutils-msp430 - apt install -y gcc-msp430 + - eval $(ssh-agent -s) + - echo "$SSH_PRIVATE_KEY" | ssh-add + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts + - chmod 644 ~/.ssh/known_hosts script: - make clean - make all From 50c4692657fce2b173e77c839ae2e21ac4e5c467 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 16:31:19 +0100 Subject: [PATCH 04/21] fix use ssh in ci script --- .gitlab-ci.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b213ee2..697cc83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,16 @@ stages: - hello - build +before_script: + - echo "Prepare ssh environment" + - eval $(ssh-agent -s) + - echo "$SSH_PRIVATE_KEY" | ssh-add + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts + - chmod 644 ~/.ssh/known_hosts + - echo "Preparing ssh environment done" + job1: stage: hello tags: @@ -38,12 +48,6 @@ job3: - apt install -y msp430-libc - apt install -y binutils-msp430 - apt install -y gcc-msp430 - - eval $(ssh-agent -s) - - echo "$SSH_PRIVATE_KEY" | ssh-add - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts - - chmod 644 ~/.ssh/known_hosts script: - make clean - make all From d014bc21f6fc275a0f2c2ff08d1a7273f728b718 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 16:33:28 +0100 Subject: [PATCH 05/21] 2. fix use ssh in ci script --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 697cc83..d074bf5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ stages: before_script: - echo "Prepare ssh environment" - eval $(ssh-agent -s) - - echo "$SSH_PRIVATE_KEY" | ssh-add + - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - mkdir -p ~/.ssh - chmod 700 ~/.ssh - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts From ac942e4e0b99658b5707c78cc4ca8f773e4aae96 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 16:34:50 +0100 Subject: [PATCH 06/21] 3. fix use ssh in ci script --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d074bf5..6196a63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ stages: before_script: - echo "Prepare ssh environment" - eval $(ssh-agent -s) - - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add + - echo "$SSH_PRIVATE_KEY" # | tr -d '\r' | ssh-add - mkdir -p ~/.ssh - chmod 700 ~/.ssh - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts From 78a397ddc11dce29848c5becba57f080ae5fe6f6 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 16:39:15 +0100 Subject: [PATCH 07/21] 4. fix use ssh in ci script --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6196a63..f055287 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ stages: before_script: - echo "Prepare ssh environment" - eval $(ssh-agent -s) - - echo "$SSH_PRIVATE_KEY" # | tr -d '\r' | ssh-add + - echo "$SSH_PRIVATE_KEY" # | tr -d '\r' | ssh-add - - mkdir -p ~/.ssh - chmod 700 ~/.ssh - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts From efffcde96e9494a763fa2fc8ce03fce4f356bb1b Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 16:40:29 +0100 Subject: [PATCH 08/21] 5. fix use ssh in ci script --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f055287..072b363 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ stages: before_script: - echo "Prepare ssh environment" - eval $(ssh-agent -s) - - echo "$SSH_PRIVATE_KEY" # | tr -d '\r' | ssh-add - + - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - - mkdir -p ~/.ssh - chmod 700 ~/.ssh - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts From 8d7d9eed82e7382e2aad69fb1d3c90eb7be77c71 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 16:47:41 +0100 Subject: [PATCH 09/21] 6. fix use ssh in ci script --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 072b363..88f16a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ before_script: - chmod 700 ~/.ssh - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts + - ssh git@gitlab.com - echo "Preparing ssh environment done" job1: From 552110f88e0f1e45d9f21d5e9a191f656f521fda Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 16:50:45 +0100 Subject: [PATCH 10/21] 7. fix use ssh in ci script --- .gitlab-ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88f16a1..66c451c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ stages: - hello + - testssh - build before_script: @@ -10,7 +11,6 @@ before_script: - chmod 700 ~/.ssh - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts - - ssh git@gitlab.com - echo "Preparing ssh environment done" job1: @@ -53,4 +53,12 @@ job3: - make clean - make all +job4: + stage: testssh + tags: + - hottis + - linux + - debian + script: + - ssh git@gitlab.com From cfeaac86cf19ad08fd56c0b00b8abe9f657afedd Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 16:55:42 +0100 Subject: [PATCH 11/21] 8. fix use ssh in ci script --- .gitlab-ci.yml | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66c451c..3ebe1c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,17 +1,7 @@ stages: - hello - - testssh - build -before_script: - - echo "Prepare ssh environment" - - eval $(ssh-agent -s) - - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts - - chmod 644 ~/.ssh/known_hosts - - echo "Preparing ssh environment done" job1: stage: hello @@ -45,20 +35,20 @@ job3: variables: GIT_SUBMODULE_STRATEGY: recursive before_script: + - echo "Prepare ssh environment" + - eval $(ssh-agent -s) + - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts + - chmod 644 ~/.ssh/known_hosts + - echo "Preparing ssh environment done" - apt update - apt install -y msp430-libc - apt install -y binutils-msp430 - apt install -y gcc-msp430 + script: - make clean - make all -job4: - stage: testssh - tags: - - hottis - - linux - - debian - script: - - ssh git@gitlab.com - From 59ebc8a67f1c90b7b5ffc474083a1090cd3af617 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 16:58:50 +0100 Subject: [PATCH 12/21] 9. fix use ssh in ci script --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ebe1c5..b497a23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,15 +25,19 @@ job2: job3: stage: build + tags: - hottis - linux - debian + only: refs: - master + variables: GIT_SUBMODULE_STRATEGY: recursive + before_script: - echo "Prepare ssh environment" - eval $(ssh-agent -s) From 0e4fcbb175b85135763a3c3bf3907b0836349508 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 17:01:01 +0100 Subject: [PATCH 13/21] 10. fix use ssh in ci script --- .gitlab-ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b497a23..a8280a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,19 @@ job1: - hottis - linux - debian + before_script: + - echo "Prepare ssh environment" + - eval $(ssh-agent -s) + - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts + - chmod 644 ~/.ssh/known_hosts + - echo "Preparing ssh environment done" + - apt update + - apt install -y msp430-libc + - apt install -y binutils-msp430 + - apt install -y gcc-msp430 script: - echo "Hallo" - echo "Welt" @@ -38,19 +51,6 @@ job3: variables: GIT_SUBMODULE_STRATEGY: recursive - before_script: - - echo "Prepare ssh environment" - - eval $(ssh-agent -s) - - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts - - chmod 644 ~/.ssh/known_hosts - - echo "Preparing ssh environment done" - - apt update - - apt install -y msp430-libc - - apt install -y binutils-msp430 - - apt install -y gcc-msp430 script: - make clean From 274822d4faa34e46198a8f207fa3fd302efdb7b1 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 17:03:34 +0100 Subject: [PATCH 14/21] 11. fix use ssh in ci script --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8280a7..d44e90e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,7 @@ job1: - chmod 700 ~/.ssh - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts + - ssh git@gitlab.com - echo "Preparing ssh environment done" - apt update - apt install -y msp430-libc From af148f46f57ff43fdad1523e02ef9ac48174edbb Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 17:07:16 +0100 Subject: [PATCH 15/21] 12. fix use ssh in ci script --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d44e90e..01ba6de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,7 @@ job1: - chmod 644 ~/.ssh/known_hosts - ssh git@gitlab.com - echo "Preparing ssh environment done" + - whoami - apt update - apt install -y msp430-libc - apt install -y binutils-msp430 From 3fc91c9de8e86b40358837c9dd00cd2496ae5bc5 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 17:08:28 +0100 Subject: [PATCH 16/21] 13. fix use ssh in ci script --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01ba6de..25fcff6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,10 +20,10 @@ job1: - ssh git@gitlab.com - echo "Preparing ssh environment done" - whoami - - apt update - - apt install -y msp430-libc - - apt install -y binutils-msp430 - - apt install -y gcc-msp430 + - sudo apt update + - sudo apt install -y msp430-libc + - sudo apt install -y binutils-msp430 + - sudo apt install -y gcc-msp430 script: - echo "Hallo" - echo "Welt" From c417aaa8a2c9de06d8f924aafc25ba41b5336f27 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 17:13:49 +0100 Subject: [PATCH 17/21] 14. fix use ssh in ci script --- .gitlab-ci.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 25fcff6..ba3679c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,13 +20,14 @@ job1: - ssh git@gitlab.com - echo "Preparing ssh environment done" - whoami - - sudo apt update - - sudo apt install -y msp430-libc - - sudo apt install -y binutils-msp430 - - sudo apt install -y gcc-msp430 + - # apt update + - # apt install -y msp430-libc + - # apt install -y binutils-msp430 + - # apt install -y gcc-msp430 script: - echo "Hallo" - echo "Welt" + - whoami job2: stage: hello @@ -37,6 +38,7 @@ job2: script: - echo "Hello" - echo "World" + - whoami job3: stage: build @@ -55,6 +57,7 @@ job3: script: + - whoami - make clean - make all From a57101aa42f21ecf66a41f3f1b394edc614ee3f7 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 17:14:53 +0100 Subject: [PATCH 18/21] 15. fix use ssh in ci script --- .gitlab-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba3679c..1fef941 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,10 +20,6 @@ job1: - ssh git@gitlab.com - echo "Preparing ssh environment done" - whoami - - # apt update - - # apt install -y msp430-libc - - # apt install -y binutils-msp430 - - # apt install -y gcc-msp430 script: - echo "Hallo" - echo "Welt" From 9d0481928c84f5605864e80d1fbc26ad1d22ec5b Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 17:16:59 +0100 Subject: [PATCH 19/21] 16. fix use ssh in ci script --- .gitlab-ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1fef941..330c774 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,6 +51,17 @@ job3: variables: GIT_SUBMODULE_STRATEGY: recursive + before_script: + - echo "Prepare ssh environment" + - eval $(ssh-agent -s) + - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts + - chmod 644 ~/.ssh/known_hosts + - ssh git@gitlab.com + - echo "Preparing ssh environment done" + - whoami script: - whoami From 857741341753e16d1d731597d40f721e69a4b282 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 17:36:08 +0100 Subject: [PATCH 20/21] 17. fix use ssh in ci script --- .gitlab-ci.yml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 330c774..98d1734 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,17 +9,6 @@ job1: - hottis - linux - debian - before_script: - - echo "Prepare ssh environment" - - eval $(ssh-agent -s) - - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts - - chmod 644 ~/.ssh/known_hosts - - ssh git@gitlab.com - - echo "Preparing ssh environment done" - - whoami script: - echo "Hallo" - echo "Welt" @@ -38,19 +27,15 @@ job2: job3: stage: build - tags: - hottis - linux - debian - only: refs: - master - variables: - GIT_SUBMODULE_STRATEGY: recursive - + GIT_SUBMODULE_STRATEGY: none before_script: - echo "Prepare ssh environment" - eval $(ssh-agent -s) @@ -61,9 +46,9 @@ job3: - chmod 644 ~/.ssh/known_hosts - ssh git@gitlab.com - echo "Preparing ssh environment done" - - whoami - script: + - git submodule init + - git submodule update - whoami - make clean - make all From f423c9fc0b8042a48a0cdf3b1f31cb1030af5e8a Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 12 Feb 2019 17:57:04 +0100 Subject: [PATCH 21/21] 18. fix use ssh in ci script --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98d1734..9129b21 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,6 +31,7 @@ job3: - hottis - linux - debian + - msp430 only: refs: - master @@ -50,6 +51,7 @@ job3: - git submodule init - git submodule update - whoami + - pwd - make clean - make all