diff options
| author | Sam Kleinman <samk@10gen.com> | 2015-12-11 11:26:43 -0500 |
|---|---|---|
| committer | Sam Kleinman <samk@10gen.com> | 2015-12-14 22:09:55 -0500 |
| commit | d66acd141e9f788a3bc3de96cbe332efbcc250e0 (patch) | |
| tree | 3010613bcf89fab13e2aea05244cebb43e8a1c5a | |
| parent | 40022a2fb151bab2f84db002d193b337921dce49 (diff) | |
| download | mongo-d66acd141e9f788a3bc3de96cbe332efbcc250e0.tar.gz | |
SERVER-21864: streamline use of expansions in package signing
| -rw-r--r-- | etc/evergreen.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 2d2ff1354ef..aabe308884b 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -1704,7 +1704,7 @@ tasks: silent: true script: | set -o errexit - echo "${signing_auth_token}" > signing_auth_token + echo "${signing_auth_token_32}" > signing_auth_token - command: shell.exec params: working_dir: src @@ -1718,19 +1718,19 @@ tasks: mv distsrc.${ext|tgz} mongodb-src-${src_suffix}.${ext|tar.gz} || true /usr/bin/find build/ -type f | grep msi$ | xargs -I original_filename cp original_filename mongodb-win32-${push_arch}-${suffix}.msi || true - notary-client.py --key-name "${signing_key_name}" --auth-token-file ${workdir}/src/signing_auth_token --comment "Evergreen Automatic Signing ${revision} - ${build_variant} - ${branch_name}" --notary-url http://notary-service.build.10gen.cc:5000 --skip-missing mongodb-${push_name}-${push_arch}-${suffix}.${ext|tgz} mongodb-${push_name}-${push_arch}-debugsymbols-${suffix}.${ext|tgz} mongodb-win32-${push_arch}-${suffix}.msi mongodb-src-${src_suffix}.${ext|tar.gz} + notary-client.py --key-name "server-3.2" --auth-token-file ${workdir}/src/signing_auth_token --comment "Evergreen Automatic Signing ${revision} - ${build_variant} - ${branch_name}" --notary-url http://notary-service.build.10gen.cc:5000 --skip-missing mongodb-${push_name}-${push_arch}-${suffix}.${ext|tgz} mongodb-${push_name}-${push_arch}-debugsymbols-${suffix}.${ext|tgz} mongodb-win32-${push_arch}-${suffix}.msi mongodb-src-${src_suffix}.${ext|tar.gz} if [ "${has_packages|}" = "true" ] ; then for rpm in $(find repo/ -name \*.rpm) ; do pushd $(dirname $rpm) # Use --package-file-suffix "" to overwrite existing RPM's instead of saving new "-signed.rpm" RPM files # - notary-client.py --key-name "${signing_key_name}" --auth-token-file ${workdir}/src/signing_auth_token --comment "Evergreen Automatic Signing ${revision} - ${build_variant} - ${branch_name}" --notary-url http://notary-service.build.10gen.cc:5000 --archive-file-ext gpg --outputs sig --package-file-suffix "" $(basename $rpm) + notary-client.py --key-name "server-3.2" --auth-token-file ${workdir}/src/signing_auth_token --comment "Evergreen Automatic Signing ${revision} - ${build_variant} - ${branch_name}" --notary-url http://notary-service.build.10gen.cc:5000 --archive-file-ext gpg --outputs sig --package-file-suffix "" $(basename $rpm) popd done for release_file in $(find repo/ -name Release) ; do pushd $(dirname $release_file) - notary-client.py --key-name "${signing_key_name}" --auth-token-file ${workdir}/src/signing_auth_token --comment "Evergreen Automatic Signing ${revision} - ${build_variant} - ${branch_name}" --notary-url http://notary-service.build.10gen.cc:5000 --outputs sig Release + notary-client.py --key-name "server-3.2" --auth-token-file ${workdir}/src/signing_auth_token --comment "Evergreen Automatic Signing ${revision} - ${build_variant} - ${branch_name}" --notary-url http://notary-service.build.10gen.cc:5000 --outputs sig Release popd done fi |