Skip to content

Commit 430dc14

Browse files
author
Sam Kleinman
committed
SERVER-24830: move push tasks to use relevant aws distro
1 parent 22e0e10 commit 430dc14

File tree

1 file changed

+31
-56
lines changed

1 file changed

+31
-56
lines changed

‎etc/evergreen.yml‎

Lines changed: 31 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2278,24 +2278,24 @@ tasks:
22782278
/usr/bin/find build/ -type f | grep msi$ | xargs -I original_filename cp original_filename mongodb-win32-${push_arch}-${suffix}.msi || true
22792279
22802280
# Extract shell and banner files out of scons-made archive for separate shell archive
2281-
${platform_decompress|tar zxvf} mongodb-binaries.${ext|tgz} mongodb-\*/bin/mongo${exe} mongodb-\*/[A-Z]\*
2281+
${platform_decompress|tar --wildcards -zxvf} mongodb-binaries.${ext|tgz} mongodb-*/bin/mongo${exe} mongodb-*/\[A-Z\]*
22822282
22832283
# Create new shell archive (make_archive.py uses filename to determine what format archive to create)
22842284
${python|python} buildscripts/make_archive.py -o mongodb-shell-${push_name}-${push_arch}-${suffix}.${ext|tgz} $(ls -d mongodb-*/bin/mongo${exe} mongodb-*/[A-Z]*)
22852285
2286-
notary-client.py --key-name "server-3.4" --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-shell-${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}
2286+
/usr/local/bin/notary-client.py --key-name "server-3.4" --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-shell-${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}
22872287
22882288
if [ "${has_packages|}" = "true" ] ; then
22892289
for rpm in $(find repo/ -name \*.rpm) ; do
22902290
pushd $(dirname $rpm)
22912291
# Use --package-file-suffix "" to overwrite existing RPM's instead of saving new "-signed.rpm" RPM files
22922292
#
2293-
notary-client.py --key-name "server-3.4" --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)
2293+
/usr/local/bin/notary-client.py --key-name "server-3.4" --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)
22942294
popd
22952295
done
22962296
for release_file in $(find repo/ -name Release) ; do
22972297
pushd $(dirname $release_file)
2298-
notary-client.py --key-name "server-3.4" --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
2298+
/usr/local/bin/notary-client.py --key-name "server-3.4" --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
22992299
popd
23002300
done
23012301
fi
@@ -2869,7 +2869,7 @@ buildvariants:
28692869
- name: views_WT
28702870
- name: push
28712871
distros:
2872-
- rhel55-test
2872+
- rhel70
28732873

28742874
- name: linux-64-repeated-execution
28752875
stepback: false
@@ -3239,8 +3239,6 @@ buildvariants:
32393239
- name: views
32403240
- name: views_WT
32413241
- name: push
3242-
distros:
3243-
- rhel55-test
32443242

32453243
- name: ubuntu1404
32463244
display_name: SSL Ubuntu 14.04
@@ -3354,9 +3352,6 @@ buildvariants:
33543352
- name: views
33553353
- name: views_WT
33563354
- name: push
3357-
distros:
3358-
- rhel55-test
3359-
33603355

33613356
- name: ubuntu1604
33623357
display_name: SSL Ubuntu 16.04
@@ -3467,8 +3462,6 @@ buildvariants:
34673462
- name: views
34683463
- name: views_WT
34693464
- name: push
3470-
distros:
3471-
- rhel55-test
34723465

34733466

34743467
- name: enterprise-linux-64-amazon-ami
@@ -3550,8 +3543,7 @@ buildvariants:
35503543
- name: views
35513544
- name: views_WT
35523545
- name: push
3553-
distros:
3554-
- rhel55-test
3546+
35553547

35563548
- name: amazon
35573549
display_name: SSL Amazon Linux
@@ -3665,8 +3657,6 @@ buildvariants:
36653657
- name: views
36663658
- name: views_WT
36673659
- name: push
3668-
distros:
3669-
- rhel55-test
36703660

36713661
###########################################
36723662
# Windows buildvariants #
@@ -3774,7 +3764,7 @@ buildvariants:
37743764
- name: unittests
37753765
- name: push
37763766
distros:
3777-
- rhel55-test
3767+
- rhel70
37783768

37793769
- name: windows-64-2k8
37803770
display_name: Windows 2008R2
@@ -3883,7 +3873,7 @@ buildvariants:
38833873
- name: unittests
38843874
- name: push
38853875
distros:
3886-
- rhel55-test
3876+
- rhel70
38873877

38883878
- name: windows-64-2k8-debug
38893879
display_name: "* Windows 2008R2 DEBUG"
@@ -4061,7 +4051,7 @@ buildvariants:
40614051
- name: views_WT
40624052
- name: push
40634053
distros:
4064-
- rhel55-test
4054+
- rhel70
40654055

40664056
- name: enterprise-windows-64-inmem
40674057
display_name: Enterprise Windows (inMemory)
@@ -4212,7 +4202,7 @@ buildvariants:
42124202
- name: sslSpecial
42134203
- name: push
42144204
distros:
4215-
- rhel55-test
4205+
- rhel70
42164206

42174207
###########################################
42184208
# OSX buildvariants #
@@ -4312,7 +4302,7 @@ buildvariants:
43124302
- name: views_WT
43134303
- name: push
43144304
distros:
4315-
- rhel55-test
4305+
- rhel70
43164306

43174307
- name: osx-107-ssl
43184308
display_name: SSL OS X 10.7
@@ -4407,7 +4397,7 @@ buildvariants:
44074397
- name: unittests
44084398
- name: push
44094399
distros:
4410-
- rhel55-test
4400+
- rhel70
44114401

44124402
- name: osx-107-debug
44134403
display_name: "* OS X 10.7 DEBUG"
@@ -4496,7 +4486,7 @@ buildvariants:
44964486
- name: views_WT
44974487
- name: push
44984488
distros:
4499-
- rhel55-test
4489+
- rhel70
45004490

45014491
###########################################
45024492
# Redhat buildvariants #
@@ -4683,7 +4673,8 @@ buildvariants:
46834673
- name: views_WT
46844674
- name: push
46854675
distros:
4686-
- rhel55-test
4676+
- rhel70
4677+
46874678

46884679
- name: enterprise-rhel-70-64-bit
46894680
display_name: Enterprise RHEL 7.0
@@ -4732,8 +4723,7 @@ buildvariants:
47324723
- name: sslSpecial
47334724
- name: unittests
47344725
- name: push
4735-
distros:
4736-
- rhel55-test
4726+
47374727

47384728
- name: rhel62
47394729
display_name: SSL RHEL 6.2
@@ -4846,7 +4836,8 @@ buildvariants:
48464836
- name: views_WT
48474837
- name: push
48484838
distros:
4849-
- rhel55-test
4839+
- rhel70
4840+
48504841

48514842
- name: rhel70
48524843
display_name: SSL RHEL 7.0
@@ -4958,8 +4949,7 @@ buildvariants:
49584949
- name: views
49594950
- name: views_WT
49604951
- name: push
4961-
distros:
4962-
- rhel55-test
4952+
49634953

49644954
- name: enterprise-rhel-71-ppc64le
49654955
display_name: Enterprise RHEL 7.1 PPC64LE
@@ -5094,7 +5084,7 @@ buildvariants:
50945084
- name: views_WT
50955085
- name: push
50965086
distros:
5097-
- rhel55-test
5087+
- rhel70
50985088

50995089
- name: enterprise-rhel-72-s390x
51005090
display_name: Enterprise RHEL 7.2 s390x
@@ -5228,7 +5218,7 @@ buildvariants:
52285218
- name: views_WT
52295219
- name: push
52305220
distros:
5231-
- rhel55-test
5221+
- rhel70
52325222

52335223
###########################################
52345224
# Ubuntu buildvariants #
@@ -5282,8 +5272,7 @@ buildvariants:
52825272
- name: sslSpecial
52835273
- name: unittests
52845274
- name: push
5285-
distros:
5286-
- rhel55-test
5275+
52875276

52885277
- name: enterprise-ubuntu1404-64
52895278
display_name: Enterprise Ubuntu 14.04
@@ -5336,8 +5325,7 @@ buildvariants:
53365325
- name: sslSpecial
53375326
- name: unittests
53385327
- name: push
5339-
distros:
5340-
- rhel55-test
5328+
53415329

53425330
- name: enterprise-ubuntu1604-64
53435331
display_name: Enterprise Ubuntu 16.04
@@ -5387,8 +5375,7 @@ buildvariants:
53875375
- name: sslSpecial
53885376
- name: unittests
53895377
- name: push
5390-
distros:
5391-
- rhel55-test
5378+
53925379

53935380
- name: enterprise-ubuntu1404-clang-3.4-libc
53945381
display_name: "~Enterprise Ubuntu 14.04 (Clang 3.4/libc++)"
@@ -5541,8 +5528,7 @@ buildvariants:
55415528
- name: sslSpecial
55425529
- name: unittests
55435530
- name: push
5544-
distros:
5545-
- rhel55-test
5531+
55465532

55475533
- name: suse12
55485534
display_name: SSL SUSE 12
@@ -5652,8 +5638,7 @@ buildvariants:
56525638
- name: views
56535639
- name: views_WT
56545640
- name: push
5655-
distros:
5656-
- rhel55-test
5641+
56575642

56585643
- name: enterprise-suse11-64
56595644
display_name: Enterprise SLES 11
@@ -5703,8 +5688,7 @@ buildvariants:
57035688
- name: sslSpecial
57045689
- name: unittests
57055690
- name: push
5706-
distros:
5707-
- rhel55-test
5691+
57085692

57095693
- name: suse11
57105694
display_name: SSL SUSE 11
@@ -5814,8 +5798,7 @@ buildvariants:
58145798
- name: views
58155799
- name: views_WT
58165800
- name: push
5817-
distros:
5818-
- rhel55-test
5801+
58195802

58205803
###########################################
58215804
# Solaris buildvariants #
@@ -5900,7 +5883,7 @@ buildvariants:
59005883
- name: views_WT
59015884
- name: push
59025885
distros:
5903-
- rhel55-test
5886+
- rhel70
59045887

59055888
###########################################
59065889
# Debian buildvariants #
@@ -5954,8 +5937,7 @@ buildvariants:
59545937
- name: sslSpecial
59555938
- name: unittests
59565939
- name: push
5957-
distros:
5958-
- rhel55-test
5940+
59595941

59605942
- name: enterprise-debian81-64
59615943
display_name: Enterprise Debian 8.1
@@ -6005,8 +5987,6 @@ buildvariants:
60055987
- name: sslSpecial
60065988
- name: unittests
60075989
- name: push
6008-
distros:
6009-
- rhel55-test
60105990

60115991

60125992
- name: debian71
@@ -6120,8 +6100,6 @@ buildvariants:
61206100
- name: views
61216101
- name: views_WT
61226102
- name: push
6123-
distros:
6124-
- rhel55-test
61256103

61266104

61276105
- name: debian81
@@ -6235,8 +6213,6 @@ buildvariants:
62356213
- name: views
62366214
- name: views_WT
62376215
- name: push
6238-
distros:
6239-
- rhel55-test
62406216

62416217

62426218
################################
@@ -7029,8 +7005,7 @@ buildvariants:
70297005
- name: views
70307006
- name: views_WT
70317007
- name: push
7032-
distros:
7033-
- rhel55-test
7008+
70347009

70357010
- name: enterprise-ubuntu-dynamic-1604-64-bit
70367011
display_name: "* Shared Library Enterprise Ubuntu 16.04"

0 commit comments

Comments
 (0)