diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2016-10-19 15:03:40 +0100 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2016-10-19 15:03:40 +0100 |
| commit | 45d7c7a866935e5e9527d1936606eeb467507219 (patch) | |
| tree | 0cd8452de2199a2537032433b57108bcdbde27f3 /jdk8-jtreg-test-publish-results.yaml | |
| parent | abfc22bcb7ba758ae80616ed8a95d9405a6fb3fd (diff) | |
jdk: Remove ssh-agent workaround
The standard Jenkins plugin for ssh-agent credentials now works. Remove
Fathi's workaround.
Change-Id: I09e152851403cc91186e99673fb448ccc2c59543
Diffstat (limited to 'jdk8-jtreg-test-publish-results.yaml')
| -rw-r--r-- | jdk8-jtreg-test-publish-results.yaml | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/jdk8-jtreg-test-publish-results.yaml b/jdk8-jtreg-test-publish-results.yaml index da7b60d1e0..7f8a582b9b 100644 --- a/jdk8-jtreg-test-publish-results.yaml +++ b/jdk8-jtreg-test-publish-results.yaml @@ -29,13 +29,8 @@ wrappers: - timestamps - ssh-agent-credentials: - # openjdk-testing user id users: - '744cffb4-9ce1-4856-b103-9fdda06dad36' - - credentials-binding: - - text: - credential-id: OPENJDK_KEY - variable: PRIVATE_KEY builders: - copyartifact: project: jtreg-build @@ -46,53 +41,6 @@ set -ex - # Start ssh-agent workaround - trap cleanup_exit INT TERM EXIT - - cleanup_exit() - { - kill -9 ${SSH_AGENT_PID} - } - - TMPKEYDIR=$(mktemp -d /tmp/sct.XXXXXX) - cat > ${TMPKEYDIR}/private-key-wrapper.py << EOF - #!/usr/bin/python - - import os - import sys - - def main(): - private_key = os.environ.get("PRIVATE_KEY", "Undefined") - if private_key == "Undefined": - sys.exit("PRIVATE_KEY is not defined.") - - buffer = private_key.replace(' ','\n') - with open('linaro-private-key', 'w') as f: - f.write('-----BEGIN RSA PRIVATE KEY-----\n') - f.write(buffer) - f.write('\n-----END RSA PRIVATE KEY-----\n') - - if __name__ == "__main__": - main() - EOF - python ${TMPKEYDIR}/private-key-wrapper.py - chmod 0600 ${WORKSPACE}/linaro-private-key - - eval `ssh-agent` >/dev/null 2>/dev/null - ssh-add ${WORKSPACE}/linaro-private-key >/dev/null 2>/dev/null - rm -rf ${WORKSPACE}/linaro-private-key ${TMPKEYDIR} - - test -d ~/.ssh || mkdir ~/.ssh - ssh-keyscan people.linaro.org >> ~/.ssh/known_hosts - LANG=C sort -u ~/.ssh/known_hosts | sponge ~/.ssh/known_hosts - cat << EOF >> ~/.ssh/config - Host people.linaro.org - User stuart.monteith - EOF - chmod 0600 ~/.ssh/* - - # End workload - PERSIST=$HOME/srv/openjdk SCRIPT_DIR=$PERSIST/openjdk-test-scripts |