diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2021-03-27 08:00:36 +0100 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2021-03-27 08:00:36 +0100 |
| commit | c2b56cd73cd32985527f413fc54dfcaf4bebf2e4 (patch) | |
| tree | ac4081ed9d56e354feece827dbd7515fa0afdceb | |
| parent | c25774e230985a625fa5112f3f19e03302e49e7f (diff) | |
| download | nettle-c2b56cd73cd32985527f413fc54dfcaf4bebf2e4.tar.gz | |
gitlab-ci: Use pipeline variable S390X_ACCOUNT
And enable remote/s390x job only when needed variables are set.
| -rw-r--r-- | .gitlab-ci.yml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88fcbb26..3e59a7ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ variables: FEDORA_BUILD: buildenv-fedora31 DEBIAN_X86_CROSS_BUILD: buildenv-debian-x86-cross GET_SOURCES_ATTEMPTS: "3" - S390X_HOST: nettle-ci@148.100.78.99 # remove any pre-installed headers from nettle before_script: @@ -180,7 +179,7 @@ remote/s390x: before_script: # File created as world-readable by gitlab ci machinery. - chmod 0600 $SSH_PRIVATE_KEY - - ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_HOST + - ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_ACCOUNT "mkdir -p ci-work/$CI_PIPELINE_IID" script: - echo $CI_PIPELINE_IID @@ -188,17 +187,21 @@ remote/s390x: ./configure && make PACKAGE_VERSION=snapshot dist && ls -l *.tar.gz - cat nettle-snapshot.tar.gz | - ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_HOST + ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_ACCOUNT "cd ci-work/$CI_PIPELINE_IID && tar xzf -" - - ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_HOST + - ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_ACCOUNT "cd ci-work/$CI_PIPELINE_IID/nettle-snapshot && ./configure --disable-documentation" - - ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_HOST + - ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_ACCOUNT "cd ci-work/$CI_PIPELINE_IID/nettle-snapshot && make" - - ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_HOST + - ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_ACCOUNT "cd ci-work/$CI_PIPELINE_IID/nettle-snapshot && make check" after_script: - - ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_HOST + - ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_ACCOUNT "rm -rf ci-work/$CI_PIPELINE_IID" + only: + variables: + - $SSH_PRIVATE_KEY + - $S390X_ACCOUNT tags: - shared - linux |