SERVER-46983: upload to correct S3 URL for repobuilder

(cherry picked from commit 2261279b51)

etc/evergreen.yml

@@ -436,7 +436,7 @@ functions:
         aws_secret_access_key = ${kitchen_aws_secret}
         EOF
 
-        export KITCHEN_ARTIFACTS_URL="https://s3.amazonaws.com/mciuploads/${project}/${build_variant}/${revision}/artifacts/${build_id}.tgz"
+        export KITCHEN_ARTIFACTS_URL="https://s3.amazonaws.com/mciuploads/${project}/${build_variant}/${revision}/artifacts/${build_id}-packages.tgz"
         export KITCHEN_SECURITY_GROUP="${kitchen_security_group}"
         export KITCHEN_SSH_KEY_ID="${kitchen_ssh_key_id}"
         export KITCHEN_SUBNET="${kitchen_subnet}"
@@ -701,6 +701,24 @@ tasks:
           - "src/mongo/util/options_parser/test_config_files/**"
         exclude_files:
           - "*_test.pdb"
+    - command: archive.targz_pack
+      params:
+        target: "packages.tgz"
+        source_dir: "src"
+        include:
+          - "repo/**"
+          - "./**.msi"
+    - command: s3.put
+      params:
+        optional: true
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: packages.tgz
+        remote_file: ${project}/${build_variant}/${revision}/artifacts/${build_id}-packages.tgz
+        bucket: mciuploads
+        permissions: public-read
+        content_type: application/tar
+        display_name: Packages
     - func: "upload debugsymbols"
     - command: s3.put
       params:
@@ -2015,6 +2033,8 @@ tasks:
 
           cat <<EOF > notary_env.sh
           export NOTARY_TOKEN=${signing_auth_token_32}
+          export BARQUE_USERNAME=${barque_user}
+          export BARQUE_PASSWORD=${barque_password}
           EOF
 
           echo "${signing_auth_token_32}" > signing_auth_token
@@ -2036,10 +2056,10 @@ tasks:
           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-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="ea8d75dcc1a587111e7418e2428fb67e267af9fe"
+             CURATOR_RELEASE=${curator_release|"latest"}
              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
+             ./curator repo submit --service ${barque_url} --config ./etc/repo_config.yaml --distro ${packager_distro} --edition ${repo_edition} --version ${version} --arch ${packager_arch} --packages https://s3.amazonaws.com/mciuploads/${project}/${build_variant}/${revision}/artifacts/${build_id}-packages.tgz
           fi
 
     # Put the binaries tarball/zipfile

etc/system_perf.yml

@@ -140,6 +140,7 @@ functions:
           version_id: ${version_id}
           workdir: ${workdir}
           revision: ${revision}
+          project: ${project}
           project_dir: ${project_dir}
           branch_name: ${branch_name}