diff options
-rwxr-xr-x | buildscripts/generate_compile_expansions.py | 6 | ||||
-rw-r--r-- | etc/evergreen.yml | 107 |
2 files changed, 4 insertions, 109 deletions
diff --git a/buildscripts/generate_compile_expansions.py b/buildscripts/generate_compile_expansions.py index b14562c6ff9..72a4e3e3937 100755 --- a/buildscripts/generate_compile_expansions.py +++ b/buildscripts/generate_compile_expansions.py @@ -69,15 +69,11 @@ else: system_id_path = "/etc/mongodb-build-system-id" default_cache_path_base = "/data/scons-cache" -print 'scons_cache_path_base: {0}'.format(default_cache_path_base) - if os.path.isfile(system_id_path): with open(system_id_path, "r") as f: - build_system_id = f.readline().strip() - default_cache_path = os.path.join(default_cache_path_base, build_system_id) + default_cache_path = os.path.join(default_cache_path_base, f.readline().strip()) print "scons_cache_path: {0}".format(default_cache_path) - print "build_system_id: {0}".format(build_system_id) scons_cache_mode = os.getenv("SCONS_CACHE_MODE") diff --git a/etc/evergreen.yml b/etc/evergreen.yml index c0734fe6a1e..df72aba5d6a 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -235,94 +235,6 @@ functions: exit 1 fi - "get curator": - command: shell.exec - params: - working_dir: src - script: | - set -o errexit - - PLATFORM=rhel70 - - if [ "Windows_NT" = "$OS" ]; then - PLATFORM=windows-64 - fi - - if [ "${push_name|}" = "sunos5" ]; then - PLATFORM=solaris - fi - - # NOTE: there are curator builds for all platforms (non-amd64), but we don't - # use it in any of those contexts at this point. - - if [ "${install_curator|}" = "true" ]; then - CURATOR_RELEASE="3f45f5f8e7a233518504e06a04594fb6c0b21b63" - curl -L -O http://boxes.10gen.com/build/curator/curator-dist-$PLATFORM-$CURATOR_RELEASE.tar.gz - tar -zxvf curator-dist-$PLATFORM-$CURATOR_RELEASE.tar.gz - fi - - "setup aws credentials": - command: shell.exec - params: - silent: true - script: | - set -o errexit - - mkdir -p ~/.aws - - cat <<EOF > ~/.aws/config - [default] - region = us-east-1 - EOF - - cat <<EOF > ~/.aws/credentials - [default] - aws_access_key_id = ${aws_key} - aws_secret_access_key = ${aws_secret} - EOF - - "pull scons cache": - command: shell.exec - params: - shell: bash - working_dir: src - script: | - set -o errexit - set -o verbose - - # NOTE: in the future curator will be installed in - # /usr/local/bin/ on all systems, so we should just use that - # rather than install it here. - - if [ "${use_scons_cache|}" = "true" ]; then - ./curator s3 sync-from --bucket build-scons-cache --local ${scons_cache_path_base} --prefix '${build_system_id}' - fi - - if [ -d "${scons_cache_path}" ]; then - ${python|python} buildscripts/scons_cache_prune.py --cache-dir '${scons_cache_path}' --cache-size ${scons_cache_size|200} --prune-ratio ${scons_prune_ratio|0.8} - fi - - "push scons cache": - command: shell.exec - params: - shell: bash - working_dir: src - script: | - set -o errexit - set -o verbose - - # NOTE: in the future curator will be installed in - # /usr/local/bin/ on all systems, so we should just use that - # rather than install it here. - - if [ -d "${scons_cache_path}" ]; then - ${python|python} buildscripts/scons_cache_prune.py --cache-dir '${scons_cache_path}' --cache-size ${scons_cache_size|200} --prune-ratio ${scons_prune_ratio|0.8} - fi - - if [ "${use_scons_cache|}" = "true" ]; then - ./curator s3 sync-to --delete --bucket build-scons-cache --local ${scons_cache_path_base} --prefix '${build_system_id}' - fi - "get buildnumber" : &get_buildnumber command: keyval.inc params: @@ -1236,11 +1148,6 @@ tasks: # Then we load the generated version data into the agent so we can use it in task definitions - *apply_compile_expansions - - func: "setup aws credentials" - - func: "get curator" - vars: { install_curator: "${use_scons_cache|}" } - - func: "pull scons cache" - - command: shell.exec type: test params: @@ -1278,7 +1185,6 @@ tasks: # Capture a list of new and modified tests. ${python|python} buildscripts/burn_in_tests.py --branch=${branch_name} --buildVariant=${build_variant} --testListOutfile=jstests/new_tests.json --noExec $burn_in_args - - func: "push scons cache" - command: shell.exec params: working_dir: src @@ -1368,11 +1274,6 @@ tasks: # Then we load the generated version data into the agent so we can use it in task definitions. - *apply_compile_expansions - - func: "setup aws credentials" - - func: "get curator" - vars: { install_curator: "${use_scons_cache|}" } - - func: "pull scons cache" - - command: shell.exec type: test params: @@ -1387,8 +1288,6 @@ tasks: # Run the C++ unittests as part of compile_all. The compiled binaries are automatically # installed into the top-level directory by SCons. - - func: "push scons cache" - - func: "run tests" vars: resmoke_args: --suites=unittests @@ -2982,9 +2881,6 @@ tasks: echo "${signing_auth_token_34}" > signing_auth_token - - func: "get curator" - vars: { install_curator: "${has_packages|}" } - - command: shell.exec params: working_dir: src @@ -3010,6 +2906,9 @@ tasks: /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} if [ "${has_packages|}" = "true" ]; then + CURATOR_RELEASE="88f34a9f1c79db7ea9597b6e85eb5995d03714ba" + curl -L -O http://boxes.10gen.com/build/curator/curator-dist-rhel70-$CURATOR_RELEASE.tar.gz + tar -zxvf curator-dist-rhel70-$CURATOR_RELEASE.tar.gz ./curator repo --config ./etc/repo_config.yaml --distro ${packager_distro} --edition ${repo_edition} --version ${version} --arch ${packager_arch} --packages repo fi |