diff --git a/packages/build/src/barque.spec.ts b/packages/build/src/barque.spec.ts index e0debc7a4..5799b9031 100644 --- a/packages/build/src/barque.spec.ts +++ b/packages/build/src/barque.spec.ts @@ -37,8 +37,6 @@ describe('Barque', function () { 'https://repo.mongodb.com/apt/ubuntu/dists/bionic/mongodb-enterprise/6.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/ubuntu/dists/bionic/mongodb-org/7.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.com/apt/ubuntu/dists/bionic/mongodb-enterprise/7.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', - //'https://repo.mongodb.org/apt/ubuntu/dists/bionic/mongodb-org/8.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', - //'https://repo.mongodb.com/apt/ubuntu/dists/bionic/mongodb-enterprise/8.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/4.4/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.com/apt/ubuntu/dists/focal/mongodb-enterprise/4.4/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/5.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', @@ -47,8 +45,8 @@ describe('Barque', function () { 'https://repo.mongodb.com/apt/ubuntu/dists/focal/mongodb-enterprise/6.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/7.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.com/apt/ubuntu/dists/focal/mongodb-enterprise/7.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', - //'https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/8.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', - //'https://repo.mongodb.com/apt/ubuntu/dists/focal/mongodb-enterprise/8.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', + 'https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/8.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', + 'https://repo.mongodb.com/apt/ubuntu/dists/focal/mongodb-enterprise/8.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/ubuntu/dists/jammy/mongodb-org/4.4/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.com/apt/ubuntu/dists/jammy/mongodb-enterprise/4.4/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/ubuntu/dists/jammy/mongodb-org/5.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', @@ -57,8 +55,8 @@ describe('Barque', function () { 'https://repo.mongodb.com/apt/ubuntu/dists/jammy/mongodb-enterprise/6.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/ubuntu/dists/jammy/mongodb-org/7.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.com/apt/ubuntu/dists/jammy/mongodb-enterprise/7.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', - //'https://repo.mongodb.org/apt/ubuntu/dists/jammy/mongodb-org/8.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', - //'https://repo.mongodb.com/apt/ubuntu/dists/jammy/mongodb-enterprise/8.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', + 'https://repo.mongodb.org/apt/ubuntu/dists/jammy/mongodb-org/8.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', + 'https://repo.mongodb.com/apt/ubuntu/dists/jammy/mongodb-enterprise/8.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/debian/dists/buster/mongodb-org/4.4/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.com/apt/debian/dists/buster/mongodb-enterprise/4.4/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/debian/dists/buster/mongodb-org/5.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', @@ -67,8 +65,6 @@ describe('Barque', function () { 'https://repo.mongodb.com/apt/debian/dists/buster/mongodb-enterprise/6.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/debian/dists/buster/mongodb-org/7.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.com/apt/debian/dists/buster/mongodb-enterprise/7.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', - //'https://repo.mongodb.org/apt/debian/dists/buster/mongodb-org/8.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', - //'https://repo.mongodb.com/apt/debian/dists/buster/mongodb-enterprise/8.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/debian/dists/bullseye/mongodb-org/4.4/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.com/apt/debian/dists/bullseye/mongodb-enterprise/4.4/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/debian/dists/bullseye/mongodb-org/5.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', @@ -77,8 +73,6 @@ describe('Barque', function () { 'https://repo.mongodb.com/apt/debian/dists/bullseye/mongodb-enterprise/6.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/debian/dists/bullseye/mongodb-org/7.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.com/apt/debian/dists/bullseye/mongodb-enterprise/7.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', - //'https://repo.mongodb.org/apt/debian/dists/bullseye/mongodb-org/8.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', - //'https://repo.mongodb.com/apt/debian/dists/bullseye/mongodb-enterprise/8.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/debian/dists/bookworm/mongodb-org/4.4/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.com/apt/debian/dists/bookworm/mongodb-enterprise/4.4/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/debian/dists/bookworm/mongodb-org/5.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', @@ -87,8 +81,8 @@ describe('Barque', function () { 'https://repo.mongodb.com/apt/debian/dists/bookworm/mongodb-enterprise/6.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/debian/dists/bookworm/mongodb-org/7.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.com/apt/debian/dists/bookworm/mongodb-enterprise/7.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', - //'https://repo.mongodb.org/apt/debian/dists/bookworm/mongodb-org/8.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', - //'https://repo.mongodb.com/apt/debian/dists/bookworm/mongodb-enterprise/8.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', + 'https://repo.mongodb.org/apt/debian/dists/bookworm/mongodb-org/8.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', + 'https://repo.mongodb.com/apt/debian/dists/bookworm/mongodb-enterprise/8.0/main/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', ], }, { @@ -103,8 +97,6 @@ describe('Barque', function () { 'https://repo.mongodb.com/yum/redhat/7/mongodb-enterprise/6.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/redhat/7/mongodb-org/7.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/redhat/7/mongodb-enterprise/7.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.org/yum/redhat/7/mongodb-org/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.com/yum/redhat/7/mongodb-enterprise/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/redhat/8/mongodb-org/4.4/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/4.4/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/redhat/8/mongodb-org/5.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', @@ -113,8 +105,8 @@ describe('Barque', function () { 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/6.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/redhat/8/mongodb-org/7.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/7.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.org/yum/redhat/8/mongodb-org/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.org/yum/redhat/8/mongodb-org/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/redhat/9/mongodb-org/4.4/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/redhat/9/mongodb-enterprise/4.4/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/redhat/9/mongodb-org/5.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', @@ -123,8 +115,8 @@ describe('Barque', function () { 'https://repo.mongodb.com/yum/redhat/9/mongodb-enterprise/6.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/redhat/9/mongodb-org/7.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/redhat/9/mongodb-enterprise/7.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.org/yum/redhat/9/mongodb-org/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.com/yum/redhat/9/mongodb-enterprise/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.org/yum/redhat/9/mongodb-org/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.com/yum/redhat/9/mongodb-enterprise/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2013.03/mongodb-org/4.4/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/amazon/2013.03/mongodb-enterprise/4.4/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2013.03/mongodb-org/5.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', @@ -133,8 +125,6 @@ describe('Barque', function () { 'https://repo.mongodb.com/yum/amazon/2013.03/mongodb-enterprise/6.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2013.03/mongodb-org/7.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/amazon/2013.03/mongodb-enterprise/7.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.org/yum/amazon/2013.03/mongodb-org/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.com/yum/amazon/2013.03/mongodb-enterprise/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2/mongodb-org/4.4/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/amazon/2/mongodb-enterprise/4.4/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2/mongodb-org/5.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', @@ -143,8 +133,6 @@ describe('Barque', function () { 'https://repo.mongodb.com/yum/amazon/2/mongodb-enterprise/6.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2/mongodb-org/7.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/amazon/2/mongodb-enterprise/7.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.org/yum/amazon/2/mongodb-org/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.com/yum/amazon/2/mongodb-enterprise/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2023/mongodb-org/4.4/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/amazon/2023/mongodb-enterprise/4.4/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2023/mongodb-org/5.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', @@ -153,8 +141,8 @@ describe('Barque', function () { 'https://repo.mongodb.com/yum/amazon/2023/mongodb-enterprise/6.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2023/mongodb-org/7.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/amazon/2023/mongodb-enterprise/7.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.org/yum/amazon/2023/mongodb-org/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.com/yum/amazon/2023/mongodb-enterprise/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.org/yum/amazon/2023/mongodb-org/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.com/yum/amazon/2023/mongodb-enterprise/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/zypper/suse/12/mongodb-org/4.4/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/zypper/suse/12/mongodb-enterprise/4.4/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/zypper/suse/12/mongodb-org/5.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', @@ -163,8 +151,8 @@ describe('Barque', function () { 'https://repo.mongodb.com/zypper/suse/12/mongodb-enterprise/6.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/zypper/suse/12/mongodb-org/7.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/zypper/suse/12/mongodb-enterprise/7.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.org/zypper/suse/12/mongodb-org/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.com/zypper/suse/12/mongodb-enterprise/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.org/zypper/suse/12/mongodb-org/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.com/zypper/suse/12/mongodb-enterprise/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/zypper/suse/15/mongodb-org/4.4/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/zypper/suse/15/mongodb-enterprise/4.4/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/zypper/suse/15/mongodb-org/5.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', @@ -173,8 +161,8 @@ describe('Barque', function () { 'https://repo.mongodb.com/zypper/suse/15/mongodb-enterprise/6.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/zypper/suse/15/mongodb-org/7.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/zypper/suse/15/mongodb-enterprise/7.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.org/zypper/suse/15/mongodb-org/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.com/zypper/suse/15/mongodb-enterprise/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.org/zypper/suse/15/mongodb-org/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.com/zypper/suse/15/mongodb-enterprise/8.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', ], }, { @@ -189,8 +177,8 @@ describe('Barque', function () { 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/6.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/redhat/8/mongodb-org/7.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/7.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.org/yum/redhat/8/mongodb-org/8.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/8.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.org/yum/redhat/8/mongodb-org/8.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/8.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/redhat/9/mongodb-org/4.4/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/redhat/9/mongodb-enterprise/4.4/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/redhat/9/mongodb-org/5.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', @@ -199,8 +187,8 @@ describe('Barque', function () { 'https://repo.mongodb.com/yum/redhat/9/mongodb-enterprise/6.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/redhat/9/mongodb-org/7.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/redhat/9/mongodb-enterprise/7.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.org/yum/redhat/9/mongodb-org/8.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.com/yum/redhat/9/mongodb-enterprise/8.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.org/yum/redhat/9/mongodb-org/8.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.com/yum/redhat/9/mongodb-enterprise/8.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2/mongodb-org/4.4/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/amazon/2/mongodb-enterprise/4.4/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2/mongodb-org/5.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', @@ -209,8 +197,6 @@ describe('Barque', function () { 'https://repo.mongodb.com/yum/amazon/2/mongodb-enterprise/6.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2/mongodb-org/7.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/amazon/2/mongodb-enterprise/7.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.org/yum/amazon/2/mongodb-org/8.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.com/yum/amazon/2/mongodb-enterprise/8.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2023/mongodb-org/4.4/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/amazon/2023/mongodb-enterprise/4.4/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2023/mongodb-org/5.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', @@ -219,8 +205,8 @@ describe('Barque', function () { 'https://repo.mongodb.com/yum/amazon/2023/mongodb-enterprise/6.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2023/mongodb-org/7.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.com/yum/amazon/2023/mongodb-enterprise/7.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.org/yum/amazon/2023/mongodb-org/8.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', - //'https://repo.mongodb.com/yum/amazon/2023/mongodb-enterprise/8.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.org/yum/amazon/2023/mongodb-org/8.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.com/yum/amazon/2023/mongodb-enterprise/8.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', ], }, { @@ -235,8 +221,6 @@ describe('Barque', function () { 'https://repo.mongodb.com/yum/redhat/7/mongodb-enterprise/6.0/s390x/RPMS/mongodb-mongosh-0.1.0.el7.s390x.rpm', 'https://repo.mongodb.org/yum/redhat/7/mongodb-org/7.0/s390x/RPMS/mongodb-mongosh-0.1.0.el7.s390x.rpm', 'https://repo.mongodb.com/yum/redhat/7/mongodb-enterprise/7.0/s390x/RPMS/mongodb-mongosh-0.1.0.el7.s390x.rpm', - //'https://repo.mongodb.org/yum/redhat/7/mongodb-org/8.0/s390x/RPMS/mongodb-mongosh-0.1.0.el7.s390x.rpm', - //'https://repo.mongodb.com/yum/redhat/7/mongodb-enterprise/8.0/s390x/RPMS/mongodb-mongosh-0.1.0.el7.s390x.rpm', 'https://repo.mongodb.org/yum/redhat/8/mongodb-org/4.4/s390x/RPMS/mongodb-mongosh-0.1.0.el7.s390x.rpm', 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/4.4/s390x/RPMS/mongodb-mongosh-0.1.0.el7.s390x.rpm', 'https://repo.mongodb.org/yum/redhat/8/mongodb-org/5.0/s390x/RPMS/mongodb-mongosh-0.1.0.el7.s390x.rpm', @@ -245,8 +229,8 @@ describe('Barque', function () { 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/6.0/s390x/RPMS/mongodb-mongosh-0.1.0.el7.s390x.rpm', 'https://repo.mongodb.org/yum/redhat/8/mongodb-org/7.0/s390x/RPMS/mongodb-mongosh-0.1.0.el7.s390x.rpm', 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/7.0/s390x/RPMS/mongodb-mongosh-0.1.0.el7.s390x.rpm', - //'https://repo.mongodb.org/yum/redhat/8/mongodb-org/8.0/s390x/RPMS/mongodb-mongosh-0.1.0.el7.s390x.rpm', - //'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/8.0/s390x/RPMS/mongodb-mongosh-0.1.0.el7.s390x.rpm', + 'https://repo.mongodb.org/yum/redhat/8/mongodb-org/8.0/s390x/RPMS/mongodb-mongosh-0.1.0.el7.s390x.rpm', + 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/8.0/s390x/RPMS/mongodb-mongosh-0.1.0.el7.s390x.rpm', ], }, { @@ -261,8 +245,6 @@ describe('Barque', function () { 'https://repo.mongodb.com/yum/redhat/7/mongodb-enterprise/6.0/ppc64le/RPMS/mongodb-mongosh-0.1.0.el7.ppc64le.rpm', 'https://repo.mongodb.org/yum/redhat/7/mongodb-org/7.0/ppc64le/RPMS/mongodb-mongosh-0.1.0.el7.ppc64le.rpm', 'https://repo.mongodb.com/yum/redhat/7/mongodb-enterprise/7.0/ppc64le/RPMS/mongodb-mongosh-0.1.0.el7.ppc64le.rpm', - //'https://repo.mongodb.org/yum/redhat/7/mongodb-org/8.0/ppc64le/RPMS/mongodb-mongosh-0.1.0.el7.ppc64le.rpm', - //'https://repo.mongodb.com/yum/redhat/7/mongodb-enterprise/8.0/ppc64le/RPMS/mongodb-mongosh-0.1.0.el7.ppc64le.rpm', 'https://repo.mongodb.org/yum/redhat/8/mongodb-org/4.4/ppc64le/RPMS/mongodb-mongosh-0.1.0.el7.ppc64le.rpm', 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/4.4/ppc64le/RPMS/mongodb-mongosh-0.1.0.el7.ppc64le.rpm', 'https://repo.mongodb.org/yum/redhat/8/mongodb-org/5.0/ppc64le/RPMS/mongodb-mongosh-0.1.0.el7.ppc64le.rpm', @@ -271,8 +253,8 @@ describe('Barque', function () { 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/6.0/ppc64le/RPMS/mongodb-mongosh-0.1.0.el7.ppc64le.rpm', 'https://repo.mongodb.org/yum/redhat/8/mongodb-org/7.0/ppc64le/RPMS/mongodb-mongosh-0.1.0.el7.ppc64le.rpm', 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/7.0/ppc64le/RPMS/mongodb-mongosh-0.1.0.el7.ppc64le.rpm', - //'https://repo.mongodb.org/yum/redhat/8/mongodb-org/8.0/ppc64le/RPMS/mongodb-mongosh-0.1.0.el7.ppc64le.rpm', - //'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/8.0/ppc64le/RPMS/mongodb-mongosh-0.1.0.el7.ppc64le.rpm', + 'https://repo.mongodb.org/yum/redhat/8/mongodb-org/8.0/ppc64le/RPMS/mongodb-mongosh-0.1.0.el7.ppc64le.rpm', + 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/8.0/ppc64le/RPMS/mongodb-mongosh-0.1.0.el7.ppc64le.rpm', ], }, ] as const @@ -346,6 +328,10 @@ describe('Barque', function () { const result = getReposAndArch(variant); expect(result.ppas).to.be.an('array'); expect(result.arch).to.be.a('string'); + if (result.ppas.length > 0) { + expect(result.ppas[0].repo).to.be.a('string'); + expect(result.ppas[0].serverVersions).to.be.an('array'); + } }); } }); diff --git a/packages/build/src/barque.ts b/packages/build/src/barque.ts index b36d09bd1..ee5f62ca0 100644 --- a/packages/build/src/barque.ts +++ b/packages/build/src/barque.ts @@ -18,6 +18,12 @@ import { Platform, } from './config'; import { withRetries } from './helpers'; +import type { + PPARepository, + SupportedServerVersion, + PPARepositoryAndServerVersions, +} from './config/server-with-ppa'; +import { getSupportedServersForPPAs } from './config/server-with-ppa'; const pipeline = util.promisify(stream.pipeline); const execFile = util.promisify(childProcess.execFile); @@ -28,25 +34,6 @@ export const LATEST_CURATOR = // make sure everything written in /tmp is cleared if an uncaught exception occurs tmp.setGracefulCleanup(); -/** - * All the possible per-Linux-distro repositories that we publish to. - */ -type PPARepository = - | 'ubuntu1804' - | 'ubuntu2004' - | 'ubuntu2204' - | 'debian10' - | 'debian11' - | 'debian12' - | 'rhel70' - | 'rhel80' - | 'rhel90' - | 'amazon1' - | 'amazon2' - | 'amazon2023' - | 'suse12' - | 'suse15'; - /** * Return the full list of [distro, arch] combinations that we upload for * a given package variant (where 'distro' refers to a distro in the package @@ -55,7 +42,7 @@ type PPARepository = * /config/repo-config.yml needs to be kept in sync with this. */ export function getReposAndArch(packageVariant: PackageVariant): { - ppas: PPARepository[]; + ppas: PPARepositoryAndServerVersions[]; arch: string; } { switch (getDistro(packageVariant)) { @@ -66,20 +53,20 @@ export function getReposAndArch(packageVariant: PackageVariant): { return { ppas: [], arch: '' }; case 'deb': return { - ppas: [ + ppas: getSupportedServersForPPAs([ 'ubuntu1804', 'ubuntu2004', 'ubuntu2204', 'debian10', 'debian11', 'debian12', - ], + ]), arch: getDebArchName(getArch(packageVariant)), }; case 'rpm': if (getArch(packageVariant) === 'x64') { return { - ppas: [ + ppas: getSupportedServersForPPAs([ 'rhel70', 'rhel80', 'rhel90', @@ -88,13 +75,18 @@ export function getReposAndArch(packageVariant: PackageVariant): { 'amazon2023', 'suse12', 'suse15', - ], + ]), arch: getRPMArchName(getArch(packageVariant)), }; } if (getArch(packageVariant) === 'arm64') { return { - ppas: ['rhel80', 'rhel90', 'amazon2', 'amazon2023'], + ppas: getSupportedServersForPPAs([ + 'rhel80', + 'rhel90', + 'amazon2', + 'amazon2023', + ]), arch: getRPMArchName(getArch(packageVariant)), }; } @@ -103,7 +95,7 @@ export function getReposAndArch(packageVariant: PackageVariant): { getArch(packageVariant) === 's390x' ) { return { - ppas: ['rhel70', 'rhel80'], + ppas: getSupportedServersForPPAs(['rhel70', 'rhel80']), arch: getRPMArchName(getArch(packageVariant)), }; } @@ -116,11 +108,13 @@ export function getReposAndArch(packageVariant: PackageVariant): { export class Barque { private config: Config; private mongodbEditions: string[]; - private mongodbVersions: { - version: string; - notaryKeyName: string; - notaryToken: string; - }[]; + private serverVersionNotaryKeys: Record< + SupportedServerVersion, + { + notaryKeyName: string; + notaryToken: string; + } + >; private downloadedCuratorPromise: Promise | undefined; constructor(config: Config) { @@ -131,33 +125,28 @@ export class Barque { this.config = config; this.mongodbEditions = ['org', 'enterprise']; // linux mongodb versions to release to. - this.mongodbVersions = [ - { - version: '4.4.0', + this.serverVersionNotaryKeys = { + '4.4.0': { notaryKeyName: 'server-4.4', notaryToken: process.env.SIGNING_AUTH_TOKEN_44 ?? '', }, - { - version: '5.0.0', + '5.0.0': { notaryKeyName: 'server-5.0', notaryToken: process.env.SIGNING_AUTH_TOKEN_50 ?? '', }, - { - version: '6.0.0', + '6.0.0': { notaryKeyName: 'server-6.0', notaryToken: process.env.SIGNING_AUTH_TOKEN_60 ?? '', }, - { - version: '7.0.0', + '7.0.0': { notaryKeyName: 'server-7.0', notaryToken: process.env.SIGNING_AUTH_TOKEN_70 ?? '', }, - //{ - // version: '8.0.0', - // notaryKeyName: 'server-8.0', - // notaryToken: process.env.SIGNING_AUTH_TOKEN_80 ?? '', - //}, - ]; + '8.0.0': { + notaryKeyName: 'server-8.0', + notaryToken: process.env.SIGNING_AUTH_TOKEN_80 ?? '', + }, + }; } /** @@ -220,14 +209,13 @@ export class Barque { curatorDirPath: string, packageUrl: string, repoConfig: string, - ppas: PPARepository[], + ppasWithServerVersions: PPARepositoryAndServerVersions[], architecture: string, curatorService: string ): Promise { const results: Promise[] = []; - for (const ppa of ppas) { - for (const { version, notaryKeyName, notaryToken } of this - .mongodbVersions) { + for (const { repo: ppa, serverVersions } of ppasWithServerVersions) { + for (const version of serverVersions) { for (const edition of this.mongodbEditions) { const args = [ '--level', @@ -258,8 +246,10 @@ export class Barque { execFile(`${curatorDirPath}/curator`, args, { // curator looks for these options in env env: { - NOTARY_KEY_NAME: notaryKeyName, - NOTARY_TOKEN: notaryToken, + NOTARY_KEY_NAME: + this.serverVersionNotaryKeys[version].notaryKeyName, + NOTARY_TOKEN: + this.serverVersionNotaryKeys[version].notaryToken, BARQUE_API_KEY: process.env.BARQUE_API_KEY, BARQUE_USERNAME: process.env.BARQUE_USERNAME, }, diff --git a/packages/build/src/config/server-with-ppa.ts b/packages/build/src/config/server-with-ppa.ts new file mode 100644 index 000000000..eb627f7e1 --- /dev/null +++ b/packages/build/src/config/server-with-ppa.ts @@ -0,0 +1,135 @@ +export type SupportedServerVersion = + | '4.4.0' + | '5.0.0' + | '6.0.0' + | '7.0.0' + | '8.0.0'; + +export type PPARepositoryAndServerVersions = { + repo: PPARepository; + serverVersions: Array; +}; + +/** + * All the possible per-Linux-distro repositories that we publish to. + */ +export type PPARepository = + | 'ubuntu1804' + | 'ubuntu2004' + | 'ubuntu2204' + | 'debian10' + | 'debian11' + | 'debian12' + | 'rhel70' + | 'rhel80' + | 'rhel90' + | 'amazon1' + | 'amazon2' + | 'amazon2023' + | 'suse12' + | 'suse15'; + +export const SERVER_WITH_PPAS: Record< + SupportedServerVersion, + Array +> = { + '4.4.0': [ + 'amazon1', // MONGOSH-924 + 'amazon2', + 'amazon2023', + 'debian10', + 'debian11', + 'debian12', + 'rhel70', + 'rhel80', + 'rhel90', + 'suse12', + 'suse15', + 'ubuntu1804', + 'ubuntu2004', + 'ubuntu2204', + ], + '5.0.0': [ + 'amazon1', // MONGOSH-924 + 'amazon2', + 'amazon2023', + 'debian10', + 'debian11', + 'debian12', + 'rhel70', + 'rhel80', + 'rhel90', + 'suse12', + 'suse15', + 'ubuntu1804', + 'ubuntu2004', + 'ubuntu2204', + ], + '6.0.0': [ + 'amazon1', + 'amazon2', + 'amazon2023', + 'debian10', + 'debian11', + 'debian12', + 'rhel70', + 'rhel80', + 'rhel90', + 'suse12', + 'suse15', + 'ubuntu1804', + 'ubuntu2004', + 'ubuntu2204', + ], + '7.0.0': [ + 'amazon1', + 'amazon2', + 'amazon2023', + 'debian10', + 'debian11', + 'debian12', + 'rhel70', + 'rhel80', + 'rhel90', + 'suse12', + 'suse15', + 'ubuntu1804', + 'ubuntu2004', + 'ubuntu2204', + ], + '8.0.0': [ + 'amazon2023', + 'debian12', + 'rhel80', + 'rhel90', + 'suse12', + 'suse15', + 'ubuntu2004', + 'ubuntu2204', + ], +}; + +const PPA_WITH_SERVER_VERSIONS = new Map< + PPARepository, + Array +>(); +for (const serverVersion in SERVER_WITH_PPAS) { + const ppas = SERVER_WITH_PPAS[serverVersion as SupportedServerVersion]; + for (const ppa of ppas) { + if (!PPA_WITH_SERVER_VERSIONS.has(ppa)) { + PPA_WITH_SERVER_VERSIONS.set(ppa, []); + } + PPA_WITH_SERVER_VERSIONS.get(ppa)!.push( + serverVersion as SupportedServerVersion + ); + } +} + +export function getSupportedServersForPPAs( + ppas: Array +): Array { + return ppas.map((repo) => ({ + repo, + serverVersions: PPA_WITH_SERVER_VERSIONS.get(repo) ?? [], + })); +}