Skip to content

fix(build): fix 8.0 Linux repository lists MONGOSH-1807 #2094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 25, 2024
Merged

fix(build): fix 8.0 Linux repository lists MONGOSH-1807 #2094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions config/repo-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,18 @@ repos:
repos:
- apt/ubuntu/dists/jammy/mongodb-org

- name: ubuntu2404
type: deb
code_name: "noble"
edition: org
bucket: repo.mongodb.org
component: multiverse
architectures:
- amd64
- arm64
repos:
- apt/ubuntu/dists/noble/mongodb-org

- name: rhel70
type: rpm
edition: org
Expand Down Expand Up @@ -291,6 +303,18 @@ repos:
repos:
- apt/ubuntu/dists/jammy/mongodb-enterprise

- name: ubuntu2404
type: deb
code_name: "noble"
edition: enterprise
bucket: repo.mongodb.com
component: multiverse
architectures:
- amd64
- arm64
repos:
- apt/ubuntu/dists/noble/mongodb-enterprise

- name: rhel70
type: rpm
edition: enterprise
Expand Down
4 changes: 2 additions & 2 deletions packages/build/src/barque.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ describe('Barque', function () {
'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/noble/mongodb-org/8.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb',
'https://repo.mongodb.com/apt/ubuntu/dists/noble/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',
Expand Down Expand Up @@ -151,8 +153,6 @@ 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/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',
Expand Down
3 changes: 3 additions & 0 deletions packages/build/src/barque.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ export function getReposAndArch(packageVariant: PackageVariant): {
'ubuntu1804',
'ubuntu2004',
'ubuntu2204',
'ubuntu2404',
'debian10',
'debian11',
'debian12',
Expand Down Expand Up @@ -304,6 +305,8 @@ export class Barque {
return `${base}/apt/ubuntu/dists/focal/mongodb-${edition}/${packageFolderVersion}/multiverse/binary-${targetArchitecture}/${packageFileName}`;
case 'ubuntu2204':
return `${base}/apt/ubuntu/dists/jammy/mongodb-${edition}/${packageFolderVersion}/multiverse/binary-${targetArchitecture}/${packageFileName}`;
case 'ubuntu2404':
return `${base}/apt/ubuntu/dists/noble/mongodb-${edition}/${packageFolderVersion}/multiverse/binary-${targetArchitecture}/${packageFileName}`;
case 'debian10':
return `${base}/apt/debian/dists/buster/mongodb-${edition}/${packageFolderVersion}/main/binary-${targetArchitecture}/${packageFileName}`;
case 'debian11':
Expand Down
3 changes: 2 additions & 1 deletion packages/build/src/config/server-with-ppa.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export type PPARepository =
| 'ubuntu1804'
| 'ubuntu2004'
| 'ubuntu2204'
| 'ubuntu2404'
| 'debian10'
| 'debian11'
| 'debian12'
Expand Down Expand Up @@ -102,10 +103,10 @@ export const SERVER_WITH_PPAS: Record<
'debian12',
'rhel80',
'rhel90',
'suse12',
'suse15',
'ubuntu2004',
'ubuntu2204',
'ubuntu2404',
],
};

Expand Down
2 changes: 1 addition & 1 deletion scripts/gather-existing-releases.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ for (const release of productionReleases) {
const rhel72AndAbove = ['rhel72', ...rhel80AndAbove]
const al2AndAbove = ['amazon2', 'amazon2023', ...rhel81AndAbove]
const rhel70AndAboveAndRpmBased = ['rhel70', 'rhel71', ...rhel72AndAbove, 'amazon', ...al2AndAbove, 'suse12', 'suse15']
const ubuntu1804AndAboveAndDebBased = ['ubuntu1804', 'ubuntu1804', 'ubuntu2004', 'ubuntu2204', 'debian10', 'debian11', 'debian12']
const ubuntu1804AndAboveAndDebBased = ['ubuntu1804', 'ubuntu1804', 'ubuntu2004', 'ubuntu2204', 'ubuntu2404', 'debian10', 'debian11', 'debian12']
const allLinux = [...rhel70AndAboveAndRpmBased, ...ubuntu1804AndAboveAndDebBased]

for (const [re, targets_] of [
Expand Down