From 290112ef1396982a187217b4cb8a943416ad0db1 Mon Sep 17 00:00:00 2001 From: Tural Farhadov Date: Wed, 4 Jan 2023 20:44:19 +0000 Subject: SERVER-70819: Reverting Barque test config added by SERVER-70805 (cherry picked from commit d5b298034e0e96238fbb49dd009be5536f258bfa) --- etc/evergreen.yml | 1 - etc/evergreen_yml_components/definitions.yml | 36 -- .../variants/misc_release.yml | 33 -- etc/repo_config_test.yaml | 532 --------------------- evergreen/packages_publish_test.sh | 14 - 5 files changed, 616 deletions(-) delete mode 100644 etc/repo_config_test.yaml delete mode 100644 evergreen/packages_publish_test.sh diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 007504c01b0..0b58dd800bb 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -248,7 +248,6 @@ variables: - ubuntu2004-package - name: selinux_rhel7_enterprise - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index f06c6213a50..bfb8e1edc9f 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -7017,42 +7017,6 @@ tasks: args: - "./src/evergreen/packages_publish.sh" -- name: publish_packages_test - run_on: rhel80-small - tags: ["publish_test"] - # This should prevent this task from running in patch builds, where we - # don't want to publish packages. - patchable: false - stepback: false - # Same dependencies as "push" below - depends_on: - - name: package - - name: jsCore - - name: run_dbtest - - name: replica_sets_jscore_passthrough - commands: - - command: manifest.load - - func: "git get project and add git tag" - - func: "get and apply version expansions" - - func: "f_expansions_write" - - func: "kill processes" - - func: "cleanup environment" - - func: "set up venv" - - func: "fetch packages" - - func: "generate compile expansions" - - func: "apply compile expansions" - - func: "set up remote credentials" - vars: - aws_key_remote: ${repo_aws_key} - aws_secret_remote: ${repo_aws_secret} - - func: "set up notary client credentials" - - *f_expansions_write - - command: subprocess.exec - params: - binary: bash - args: - - "./src/evergreen/packages_publish_test.sh" - - name: push run_on: rhel80-small tags: ["publish"] diff --git a/etc/evergreen_yml_components/variants/misc_release.yml b/etc/evergreen_yml_components/variants/misc_release.yml index 3fe0023bc2c..2f6aa731dc5 100644 --- a/etc/evergreen_yml_components/variants/misc_release.yml +++ b/etc/evergreen_yml_components/variants/misc_release.yml @@ -177,7 +177,6 @@ buildvariants: distros: - ubuntu2004-package - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: enterprise-amazon2 @@ -244,7 +243,6 @@ buildvariants: distros: - ubuntu2004-package - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: amazon2-arm64 @@ -298,7 +296,6 @@ buildvariants: distros: - ubuntu1804-arm64-build - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: enterprise-amazon2-arm64 @@ -427,7 +424,6 @@ buildvariants: distros: - ubuntu1804-arm64-build - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: amazon2022-arm64 @@ -477,7 +473,6 @@ buildvariants: distros: - ubuntu2204-arm64-large - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: enterprise-amazon2022-arm64 @@ -602,7 +597,6 @@ buildvariants: distros: - ubuntu2204-arm64-large - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: debian10 @@ -658,7 +652,6 @@ buildvariants: distros: - ubuntu2004-package - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: enterprise-debian10-64 @@ -722,7 +715,6 @@ buildvariants: distros: - ubuntu2004-package - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: debian11 @@ -778,7 +770,6 @@ buildvariants: distros: - ubuntu2204-large - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: enterprise-debian11-64 @@ -840,7 +831,6 @@ buildvariants: distros: - ubuntu2204-large - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: rhel70 @@ -896,7 +886,6 @@ buildvariants: - ubuntu2004-package - name: selinux_rhel7_org - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping # This variant compiles on RHEL 7.0 and runs tests on RHEL 7.6 @@ -997,7 +986,6 @@ buildvariants: distros: - ubuntu2004-package - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: enterprise-rhel-80-64-bit @@ -1123,7 +1111,6 @@ buildvariants: - ubuntu2004-package - name: selinux_rhel8_enterprise - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: rhel-82-arm64 @@ -1175,7 +1162,6 @@ buildvariants: distros: - ubuntu1804-arm64-build - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: enterprise-rhel-82-arm64 @@ -1244,7 +1230,6 @@ buildvariants: distros: - ubuntu1804-arm64-build - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: rhel90 @@ -1296,7 +1281,6 @@ buildvariants: - ubuntu2204-large - name: selinux_rhel9_org - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: enterprise-rhel-90-64-bit @@ -1373,7 +1357,6 @@ buildvariants: - ubuntu2204-large - name: selinux_rhel9_enterprise - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: suse12 @@ -1431,7 +1414,6 @@ buildvariants: distros: - ubuntu2004-package - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: enterprise-suse12-64 @@ -1490,7 +1472,6 @@ buildvariants: distros: - ubuntu2004-package - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: enterprise-suse15-64 @@ -1542,7 +1523,6 @@ buildvariants: - name: .crypt - name: .publish_crypt - name: .publish - - name: .publish_test - name: test_packages distros: - ubuntu2004-package @@ -1597,7 +1577,6 @@ buildvariants: - name: .ssl - name: .stitch - name: .publish - - name: .publish_test - name: test_packages distros: - ubuntu2004-package @@ -1664,7 +1643,6 @@ buildvariants: distros: - ubuntu2004-package - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: enterprise-ubuntu1804-64 @@ -1747,7 +1725,6 @@ buildvariants: distros: - ubuntu2004-package - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: enterprise-ubuntu1804-arm64 @@ -1813,7 +1790,6 @@ buildvariants: distros: - ubuntu1804-arm64-build - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: ubuntu1804-arm64 @@ -1853,7 +1829,6 @@ buildvariants: distros: - ubuntu1804-arm64-build - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: ubuntu2204 @@ -1909,7 +1884,6 @@ buildvariants: distros: - ubuntu2204-large - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: ubuntu2004 @@ -1965,7 +1939,6 @@ buildvariants: distros: - ubuntu2004-package - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: enterprise-ubuntu2004-64 @@ -2031,7 +2004,6 @@ buildvariants: distros: - ubuntu2004-package - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: enterprise-ubuntu2204-64 @@ -2098,7 +2070,6 @@ buildvariants: distros: - ubuntu2204-large - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: enterprise-ubuntu2004-arm64 @@ -2160,7 +2131,6 @@ buildvariants: distros: - ubuntu1804-arm64-build - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: ubuntu2004-arm64 @@ -2198,7 +2168,6 @@ buildvariants: distros: - ubuntu1804-arm64-build - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping @@ -2254,7 +2223,6 @@ buildvariants: distros: - ubuntu2204-arm64-large - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: ubuntu2204-arm64 @@ -2288,7 +2256,6 @@ buildvariants: distros: - ubuntu2204-arm64-large - name: .publish - - name: .publish_test - name: generate_buildid_to_debug_symbols_mapping - name: windows diff --git a/etc/repo_config_test.yaml b/etc/repo_config_test.yaml deleted file mode 100644 index 2f8314a33d8..00000000000 --- a/etc/repo_config_test.yaml +++ /dev/null @@ -1,532 +0,0 @@ -templates: - deb: - org: | - Origin: mongodb - Label: mongodb - Suite: {{ .CodeName }} - Codename: {{ .CodeName }}/mongodb-org - Architectures: {{ .Architectures }} - Components: {{ .Component }} - Description: MongoDB packages - enterprise: | - Origin: mongodb - Label: mongodb - Suite: {{ .CodeName }} - Codename: {{ .CodeName }}/mongodb-enterprise - Architectures: {{ .Architectures }} - Components: {{ .Component }} - Description: MongoDB packages - index_page: | - - - - {{ .Title }} - - - - - - - - - - - {{ range $fn := .Files }} - - {{ end }} - - - - -
-

{{ .Title }}

-
-
-
- Parent Directory -
- {{ $fn }} -
-
-
-
{{ .RepoName }}
-
- - - - -repos: - -#################### -# -# Community Repos: -# -#################### - - - name: rhel70 - type: rpm - edition: org - bucket: test.repo.mongodb.org - repos: - - yum/redhat/7/mongodb-org - - yum/redhat/7Server/mongodb-org - - - name: rhel72 - type: rpm - edition: org - bucket: test.repo.mongodb.org - repos: - - yum/redhat/7/mongodb-org - - yum/redhat/7Server/mongodb-org - - - name: rhel80 - type: rpm - edition: org - bucket: test.repo.mongodb.org - repos: - - yum/redhat/8/mongodb-org - - yum/redhat/8Server/mongodb-org - - - name: rhel82 - type: rpm - edition: org - bucket: test.repo.mongodb.org - repos: - - yum/redhat/8/mongodb-org - - yum/redhat/8Server/mongodb-org - - - name: rhel83 - type: rpm - edition: org - bucket: test.repo.mongodb.org - repos: - - yum/redhat/8/mongodb-org - - yum/redhat/8Server/mongodb-org - - name: rhel90 - type: rpm - edition: org - bucket: test.repo.mongodb.org - repos: - - yum/redhat/9/mongodb-org - - yum/redhat/9Server/mongodb-org - - - - name: amazon - type: rpm - edition: org - bucket: test.repo.mongodb.org - repos: - - yum/amazon/2013.03/mongodb-org - - - name: amazon2 - type: rpm - edition: org - bucket: test.repo.mongodb.org - repos: - - yum/amazon/2/mongodb-org - - - name: amazon2022 - type: rpm - edition: org - bucket: test.repo.mongodb.org - repos: - - yum/amazon/2022/mongodb-org - - - name: suse11 - type: rpm - edition: org - bucket: test.repo.mongodb.org - repos: - - zypper/suse/11/mongodb-org - - - name: suse12 - type: rpm - edition: org - bucket: test.repo.mongodb.org - repos: - - zypper/suse/12/mongodb-org - - - name: suse15 - type: rpm - edition: org - bucket: test.repo.mongodb.org - repos: - - zypper/suse/15/mongodb-org - - - name: debian81 - type: deb - code_name: "jessie" - bucket: test.repo.mongodb.org - edition: org - component: main - architectures: - - amd64 - - i386 - repos: - - apt/debian/dists/jessie/mongodb-org - - - name: debian92 - type: deb - code_name: "stretch" - bucket: test.repo.mongodb.org - edition: org - component: main - architectures: - - amd64 - repos: - - apt/debian/dists/stretch/mongodb-org - - - name: debian10 - type: deb - code_name: "buster" - bucket: test.repo.mongodb.org - edition: org - component: main - architectures: - - amd64 - repos: - - apt/debian/dists/buster/mongodb-org - - - name: debian11 - type: deb - code_name: "bullseye" - bucket: test.repo.mongodb.org - edition: org - component: main - architectures: - - amd64 - repos: - - apt/debian/dists/bullseye/mongodb-org - - - name: debian71 - type: deb - code_name: "wheezy" - bucket: test.repo.mongodb.org - edition: org - component: main - architectures: - - amd64 - - i386 - repos: - - apt/debian/dists/wheezy/mongodb-org - - - name: ubuntu1204 - type: deb - code_name: "precise" - edition: org - bucket: test.repo.mongodb.org - component: multiverse - architectures: - - amd64 - - i386 - repos: - - apt/ubuntu/dists/precise/mongodb-org - - - name: ubuntu1404 - type: deb - code_name: "trusty" - edition: org - bucket: test.repo.mongodb.org - component: multiverse - architectures: - - amd64 - - i386 - repos: - - apt/ubuntu/dists/trusty/mongodb-org - - - name: ubuntu1804 - type: deb - code_name: "bionic" - edition: org - bucket: test.repo.mongodb.org - component: multiverse - architectures: - - amd64 - - i386 - - s390x - - arm64 - repos: - - apt/ubuntu/dists/bionic/mongodb-org - - - name: ubuntu2004 - type: deb - code_name: "focal" - edition: org - bucket: test.repo.mongodb.org - component: multiverse - architectures: - - amd64 - - s390x - - arm64 - repos: - - apt/ubuntu/dists/focal/mongodb-org - - - name: ubuntu2204 - type: deb - code_name: "jammy" - edition: org - bucket: test.repo.mongodb.org - component: multiverse - architectures: - - amd64 - - arm64 - repos: - - apt/ubuntu/dists/jammy/mongodb-org - -#################### -# -# Enterprise Repos: -# -#################### - - - name: rhel62 - type: rpm - edition: enterprise - bucket: test.repo.mongodb.com - repos: - - yum/redhat/6/mongodb-enterprise - - yum/redhat/6Server/mongodb-enterprise - - - name: rhel67 - type: rpm - edition: enterprise - bucket: test.repo.mongodb.com - repos: - - yum/redhat/6/mongodb-enterprise - - yum/redhat/6Server/mongodb-enterprise - - - name: rhel70 - type: rpm - edition: enterprise - bucket: test.repo.mongodb.com - repos: - - yum/redhat/7/mongodb-enterprise - - yum/redhat/7Server/mongodb-enterprise - - - name: rhel71 - type: rpm - edition: enterprise - bucket: test.repo.mongodb.com - repos: - - yum/redhat/7/mongodb-enterprise - - yum/redhat/7Server/mongodb-enterprise - - - name: rhel72 - type: rpm - edition: enterprise - bucket: test.repo.mongodb.com - repos: - - yum/redhat/7/mongodb-enterprise - - yum/redhat/7Server/mongodb-enterprise - - - name: rhel80 - type: rpm - edition: enterprise - bucket: test.repo.mongodb.com - repos: - - yum/redhat/8/mongodb-enterprise - - yum/redhat/8Server/mongodb-enterprise - - - name: rhel81 - type: rpm - edition: enterprise - bucket: test.repo.mongodb.com - repos: - - yum/redhat/8/mongodb-enterprise - - yum/redhat/8Server/mongodb-enterprise - - - name: rhel82 - type: rpm - edition: enterprise - bucket: test.repo.mongodb.com - repos: - - yum/redhat/8/mongodb-enterprise - - yum/redhat/8Server/mongodb-enterprise - - - name: rhel83 - type: rpm - edition: enterprise - bucket: test.repo.mongodb.com - repos: - - yum/redhat/8/mongodb-enterprise - - yum/redhat/8Server/mongodb-enterprise - - - name: rhel90 - type: rpm - edition: enterprise - bucket: test.repo.mongodb.com - repos: - - yum/redhat/9/mongodb-enterprise - - yum/redhat/9Server/mongodb-enterprise - - - name: amazon - type: rpm - edition: enterprise - bucket: test.repo.mongodb.com - repos: - - yum/amazon/2013.03/mongodb-enterprise - - - name: amazon2 - type: rpm - edition: enterprise - bucket: test.repo.mongodb.com - repos: - - yum/amazon/2/mongodb-enterprise - - - name: amazon2022 - type: rpm - edition: enterprise - bucket: test.repo.mongodb.com - repos: - - yum/amazon/2022/mongodb-enterprise - - - name: suse11 - type: rpm - edition: enterprise - bucket: test.repo.mongodb.com - repos: - - zypper/suse/11/mongodb-enterprise - - - name: suse12 - type: rpm - edition: enterprise - bucket: test.repo.mongodb.com - repos: - - zypper/suse/12/mongodb-enterprise - - - name: suse15 - type: rpm - edition: enterprise - bucket: test.repo.mongodb.com - repos: - - zypper/suse/15/mongodb-enterprise - - - name: debian10 - type: deb - edition: enterprise - code_name: "buster" - bucket: test.repo.mongodb.com - component: main - architectures: - - amd64 - repos: - - apt/debian/dists/buster/mongodb-enterprise - - - name: debian11 - type: deb - edition: enterprise - code_name: "bullseye" - bucket: test.repo.mongodb.com - component: main - architectures: - - amd64 - repos: - - apt/debian/dists/bullseye/mongodb-enterprise - - - name: debian92 - type: deb - edition: enterprise - code_name: "stretch" - bucket: test.repo.mongodb.com - component: main - architectures: - - amd64 - repos: - - apt/debian/dists/stretch/mongodb-enterprise - - - name: debian81 - type: deb - edition: enterprise - code_name: "jessie" - bucket: test.repo.mongodb.com - component: main - architectures: - - amd64 - - ppc64el - - s390x - - i386 - repos: - - apt/debian/dists/jessie/mongodb-enterprise - - - name: debian71 - type: deb - code_name: "wheezy" - edition: enterprise - bucket: test.repo.mongodb.com - component: main - architectures: - - amd64 - - ppc64el - - s390x - - i386 - repos: - - apt/debian/dists/wheezy/mongodb-enterprise - - - name: ubuntu1204 - type: deb - code_name: "precise" - edition: enterprise - bucket: test.repo.mongodb.com - component: multiverse - architectures: - - amd64 - - ppc64el - - s390x - - i386 - repos: - - apt/ubuntu/dists/precise/mongodb-enterprise - - - name: ubuntu1404 - type: deb - code_name: "trusty" - edition: enterprise - bucket: test.repo.mongodb.com - component: multiverse - architectures: - - amd64 - - ppc64el - - s390x - - i386 - repos: - - apt/ubuntu/dists/trusty/mongodb-enterprise - - - name: ubuntu1804 - type: deb - code_name: "bionic" - edition: enterprise - bucket: test.repo.mongodb.com - component: multiverse - architectures: - - amd64 - - ppc64el - - i386 - - s390x - - arm64 - repos: - - apt/ubuntu/dists/bionic/mongodb-enterprise - - - name: ubuntu2004 - type: deb - code_name: "focal" - edition: enterprise - bucket: test.repo.mongodb.com - component: multiverse - architectures: - - amd64 - - ppc64el - - s390x - - arm64 - repos: - - apt/ubuntu/dists/focal/mongodb-enterprise - - - name: ubuntu2204 - type: deb - code_name: "jammy" - edition: enterprise - bucket: test.repo.mongodb.com - component: multiverse - architectures: - - amd64 - - arm64 - repos: - - apt/ubuntu/dists/jammy/mongodb-enterprise diff --git a/evergreen/packages_publish_test.sh b/evergreen/packages_publish_test.sh deleted file mode 100644 index 1854e3ff251..00000000000 --- a/evergreen/packages_publish_test.sh +++ /dev/null @@ -1,14 +0,0 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" -. "$DIR/prelude.sh" - -cd src - -. ./notary_env.sh - -set -o errexit -set -o verbose - -CURATOR_RELEASE=${curator_release} -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 -NOTARY_KEY_NAME=${signing_key_name_test} NOTARY_TOKEN=${signing_auth_token_test} BARQUE_API_KEY=${barque_api_key_test} BARQUE_USERNAME=${barque_user_test} ./curator repo submit --service ${barque_url_test} --config ./etc/repo_config_test.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 -- cgit v1.2.1