From 5399b36a7b8820a09a91b44a9ce565a5a278e08a Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Tue, 19 Jul 2022 12:40:50 +0200 Subject: [PATCH 1/2] feat(ci): add mongosh to AL 2022, RHEL 9, Ubuntu 22.04 PPAs MONGOSH-1273 --- .evergreen.yml | 100 +++++++++++++++++++++++++++ config/release-package-matrix.js | 10 +-- config/repo-config.yml | 66 ++++++++++++++++++ packages/build/src/barque.spec.ts | 30 ++++++++ packages/build/src/barque.ts | 13 ++-- scripts/docker/rocky9-rpm.Dockerfile | 13 ++++ 6 files changed, 222 insertions(+), 10 deletions(-) create mode 100644 scripts/docker/rocky9-rpm.Dockerfile diff --git a/.evergreen.yml b/.evergreen.yml index 7aa1f5caf..e5fd1fcd9 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -9197,6 +9197,25 @@ tasks: vars: node_js_version: "16.16.0" dockerfile: rocky8-rpm + - name: pkg_test_docker_rpm_x64_rocky9_rpm + tags: ["smoke-test"] + depends_on: + - name: package_and_upload_artifact_rpm_x64 + variant: linux_package + commands: + - func: checkout + - func: get_artifact_url + vars: + source_package_variant: rpm-x64 + - func: write_preload_script + - func: install + vars: + node_js_version: "16.16.0" + npm_deps_mode: cli_build + - func: test_artifact_docker + vars: + node_js_version: "16.16.0" + dockerfile: rocky9-rpm - name: pkg_test_docker_rpm_x64_fedora34_rpm tags: ["smoke-test"] depends_on: @@ -9406,6 +9425,25 @@ tasks: vars: node_js_version: "16.16.0" dockerfile: rocky8-rpm + - name: pkg_test_docker_rpm_x64_openssl11_rocky9_rpm + tags: ["smoke-test"] + depends_on: + - name: package_and_upload_artifact_rpm_x64_openssl11 + variant: linux_package + commands: + - func: checkout + - func: get_artifact_url + vars: + source_package_variant: rpm-x64-openssl11 + - func: write_preload_script + - func: install + vars: + node_js_version: "16.16.0" + npm_deps_mode: cli_build + - func: test_artifact_docker + vars: + node_js_version: "16.16.0" + dockerfile: rocky9-rpm - name: pkg_test_docker_rpm_x64_openssl11_fedora34_rpm tags: ["smoke-test"] depends_on: @@ -9463,6 +9501,25 @@ tasks: vars: node_js_version: "16.16.0" dockerfile: rocky8-epel-rpm + - name: pkg_test_docker_rpm_x64_openssl3_rocky9_rpm + tags: ["smoke-test"] + depends_on: + - name: package_and_upload_artifact_rpm_x64_openssl3 + variant: linux_package + commands: + - func: checkout + - func: get_artifact_url + vars: + source_package_variant: rpm-x64-openssl3 + - func: write_preload_script + - func: install + vars: + node_js_version: "16.16.0" + npm_deps_mode: cli_build + - func: test_artifact_docker + vars: + node_js_version: "16.16.0" + dockerfile: rocky9-rpm - name: pkg_test_docker_rpm_x64_openssl3_amazonlinux2022_rpm tags: ["smoke-test"] depends_on: @@ -9615,6 +9672,25 @@ tasks: vars: node_js_version: "16.16.0" dockerfile: rocky8-rpm + - name: pkg_test_docker_rpm_arm64_rocky9_rpm + tags: ["smoke-test"] + depends_on: + - name: package_and_upload_artifact_rpm_arm64 + variant: linux_package + commands: + - func: checkout + - func: get_artifact_url + vars: + source_package_variant: rpm-arm64 + - func: write_preload_script + - func: install + vars: + node_js_version: "16.16.0" + npm_deps_mode: cli_build + - func: test_artifact_docker + vars: + node_js_version: "16.16.0" + dockerfile: rocky9-rpm - name: pkg_test_docker_rpm_arm64_fedora34_rpm tags: ["smoke-test"] depends_on: @@ -9748,6 +9824,25 @@ tasks: vars: node_js_version: "16.16.0" dockerfile: rocky8-rpm + - name: pkg_test_docker_rpm_arm64_openssl11_rocky9_rpm + tags: ["smoke-test"] + depends_on: + - name: package_and_upload_artifact_rpm_arm64_openssl11 + variant: linux_package + commands: + - func: checkout + - func: get_artifact_url + vars: + source_package_variant: rpm-arm64-openssl11 + - func: write_preload_script + - func: install + vars: + node_js_version: "16.16.0" + npm_deps_mode: cli_build + - func: test_artifact_docker + vars: + node_js_version: "16.16.0" + dockerfile: rocky9-rpm - name: pkg_test_docker_rpm_arm64_openssl11_fedora34_rpm tags: ["smoke-test"] depends_on: @@ -10526,6 +10621,7 @@ buildvariants: - name: pkg_test_docker_rpm_x64_amazonlinux2_rpm - name: pkg_test_docker_rpm_x64_amazonlinux2022_rpm - name: pkg_test_docker_rpm_x64_rocky8_rpm + - name: pkg_test_docker_rpm_x64_rocky9_rpm - name: pkg_test_docker_rpm_x64_fedora34_rpm - name: pkg_test_docker_rpm_x64_suse12_rpm - name: pkg_test_docker_rpm_x64_suse15_rpm @@ -10537,9 +10633,11 @@ buildvariants: - name: pkg_test_docker_rpm_x64_openssl11_amazonlinux2_rpm - name: pkg_test_docker_rpm_x64_openssl11_amazonlinux2022_rpm - name: pkg_test_docker_rpm_x64_openssl11_rocky8_rpm + - name: pkg_test_docker_rpm_x64_openssl11_rocky9_rpm - name: pkg_test_docker_rpm_x64_openssl11_fedora34_rpm - name: pkg_test_docker_deb_x64_openssl3_ubuntu22_04_deb - name: pkg_test_docker_rpm_x64_openssl3_rocky8_epel_rpm + - name: pkg_test_docker_rpm_x64_openssl3_rocky9_rpm - name: pkg_test_docker_rpm_x64_openssl3_amazonlinux2022_rpm - name: pkg_smoke_tests_docker_arm64 display_name: "package smoke tests (arm64 Docker)" @@ -10552,6 +10650,7 @@ buildvariants: - name: pkg_test_docker_deb_arm64_debian10_deb - name: pkg_test_docker_deb_arm64_debian11_deb - name: pkg_test_docker_rpm_arm64_rocky8_rpm + - name: pkg_test_docker_rpm_arm64_rocky9_rpm - name: pkg_test_docker_rpm_arm64_fedora34_rpm - name: pkg_test_docker_rpm_arm64_amazonlinux2_rpm - name: pkg_test_docker_rpm_arm64_amazonlinux2022_rpm @@ -10559,6 +10658,7 @@ buildvariants: - name: pkg_test_docker_deb_arm64_openssl11_debian10_deb - name: pkg_test_docker_deb_arm64_openssl11_debian11_deb - name: pkg_test_docker_rpm_arm64_openssl11_rocky8_rpm + - name: pkg_test_docker_rpm_arm64_openssl11_rocky9_rpm - name: pkg_test_docker_rpm_arm64_openssl11_fedora34_rpm - name: pkg_test_docker_rpm_arm64_openssl11_amazonlinux2_rpm - name: pkg_test_docker_rpm_arm64_openssl11_amazonlinux2022_rpm diff --git a/config/release-package-matrix.js b/config/release-package-matrix.js index 990d3798a..9da7d72b7 100644 --- a/config/release-package-matrix.js +++ b/config/release-package-matrix.js @@ -21,7 +21,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ packages: [ { name: 'linux-x64', description: 'Linux Tarball 64-bit', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'] }, { name: 'deb-x64', description: 'Debian / Ubuntu 64-bit', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian9-deb', 'debian10-deb', 'debian11-deb'] }, - { name: 'rpm-x64', description: 'RHEL / CentOS / Fedora / Suse 64-bit', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-rpm', 'amazonlinux2-rpm', 'amazonlinux2022-rpm', 'rocky8-rpm', 'fedora34-rpm', 'suse12-rpm', 'suse15-rpm', 'amazonlinux1-rpm'] } + { name: 'rpm-x64', description: 'RHEL / CentOS / Fedora / Suse 64-bit', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-rpm', 'amazonlinux2-rpm', 'amazonlinux2022-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'suse12-rpm', 'suse15-rpm', 'amazonlinux1-rpm'] } ] }, { @@ -30,7 +30,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ packages: [ { name: 'linux-x64-openssl11', description: 'Linux Tarball 64-bit (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'none' }, { name: 'deb-x64-openssl11', description: 'Debian / Ubuntu 64-bit (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'] }, - { name: 'rpm-x64-openssl11', description: 'RHEL / CentOS 64-bit (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-epel-rpm', 'amazonlinux2-rpm', 'amazonlinux2022-rpm', 'rocky8-rpm', 'fedora34-rpm'] } + { name: 'rpm-x64-openssl11', description: 'RHEL / CentOS 64-bit (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['centos7-epel-rpm', 'amazonlinux2-rpm', 'amazonlinux2022-rpm', 'rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm'] } ] }, { @@ -39,7 +39,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ packages: [ { name: 'linux-x64-openssl3', description: 'Linux Tarball 64-bit (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'none' }, { name: 'deb-x64-openssl3', description: 'Debian / Ubuntu 64-bit (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu22.04-deb'] }, - { name: 'rpm-x64-openssl3', description: 'RHEL / CentOS 64-bit (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'amazonlinux2022-rpm'] } + { name: 'rpm-x64-openssl3', description: 'RHEL / CentOS 64-bit (shared OpenSSL 3)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-epel-rpm', 'rocky9-rpm', 'amazonlinux2022-rpm'] } ] }, { @@ -48,7 +48,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ packages: [ { name: 'linux-arm64', description: 'Linux Tarball arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-tgz'] }, { name: 'deb-arm64', description: 'Debian / Ubuntu arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu18.04-deb', 'ubuntu20.04-deb', 'ubuntu22.04-deb', 'debian10-deb', 'debian11-deb'] }, - { name: 'rpm-arm64', description: 'RHEL / CentOS arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2022-rpm'] } + { name: 'rpm-arm64', description: 'RHEL / CentOS arm64', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2022-rpm'] } ] }, { @@ -57,7 +57,7 @@ exports.RELEASE_PACKAGE_MATRIX = [ packages: [ { name: 'linux-arm64-openssl11', description: 'Linux Tarball arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'none' }, { name: 'deb-arm64-openssl11', description: 'Debian / Ubuntu arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['ubuntu20.04-deb', 'debian10-deb', 'debian11-deb'] }, - { name: 'rpm-arm64-openssl11', description: 'Redhat / Centos arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2022-rpm'] } + { name: 'rpm-arm64-openssl11', description: 'Redhat / Centos arm64 (shared OpenSSL 1.1)', packageOn: 'linux_package', smokeTestKind: 'docker', smokeTestDockerfiles: ['rocky8-rpm', 'rocky9-rpm', 'fedora34-rpm', 'amazonlinux2-rpm', 'amazonlinux2022-rpm'] } ] }, { diff --git a/config/repo-config.yml b/config/repo-config.yml index 5268de1f6..327ab1e9c 100644 --- a/config/repo-config.yml +++ b/config/repo-config.yml @@ -118,6 +118,18 @@ repos: repos: - apt/ubuntu/dists/focal/mongodb-org + - name: ubuntu2204 + type: deb + code_name: "jammy" + edition: org + bucket: repo.mongodb.org + component: multiverse + architectures: + - amd64 + - arm64 + repos: + - apt/ubuntu/dists/jammy/mongodb-org + - name: rhel70 type: rpm edition: org @@ -139,6 +151,17 @@ repos: - yum/redhat/8/mongodb-org - yum/redhat/8Server/mongodb-org + - name: rhel90 + type: rpm + edition: org + bucket: repo.mongodb.org + architectures: + - x86_64 + - aarch64 + repos: + - yum/redhat/9/mongodb-org + - yum/redhat/9Server/mongodb-org + - name: suse12 type: rpm edition: org @@ -174,6 +197,16 @@ repos: repos: - yum/amazon/2/mongodb-org + - name: amazon2022 + type: rpm + edition: org + bucket: repo.mongodb.org + architectures: + - arm64 + - x86_64 + repos: + - yum/amazon/2022/mongodb-org + #################### # # Enterprise Repos: @@ -240,6 +273,18 @@ repos: repos: - apt/ubuntu/dists/focal/mongodb-enterprise + - name: ubuntu2204 + type: deb + code_name: "jammy" + edition: enterprise + bucket: repo.mongodb.com + component: multiverse + architectures: + - amd64 + - arm64 + repos: + - apt/ubuntu/dists/jammy/mongodb-enterprise + - name: rhel70 type: rpm edition: enterprise @@ -261,6 +306,17 @@ repos: - yum/redhat/8/mongodb-enterprise - yum/redhat/8Server/mongodb-enterprise + - name: rhel90 + type: rpm + edition: enterprise + bucket: repo.mongodb.com + architectures: + - x86_64 + - aarch64 + repos: + - yum/redhat/9/mongodb-enterprise + - yum/redhat/9Server/mongodb-enterprise + - name: suse12 type: rpm edition: enterprise @@ -295,3 +351,13 @@ repos: - x86_64 repos: - yum/amazon/2/mongodb-enterprise + + - name: amazon2022 + type: rpm + edition: enterprise + bucket: repo.mongodb.com + architectures: + - arm64 + - x86_64 + repos: + - yum/amazon/2022/mongodb-enterprise diff --git a/packages/build/src/barque.spec.ts b/packages/build/src/barque.spec.ts index 22d5bad9c..2cc0ba088 100644 --- a/packages/build/src/barque.spec.ts +++ b/packages/build/src/barque.spec.ts @@ -39,6 +39,12 @@ describe('Barque', () => { 'https://repo.mongodb.com/apt/ubuntu/dists/focal/mongodb-enterprise/5.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', 'https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/6.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', '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/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', + 'https://repo.mongodb.com/apt/ubuntu/dists/jammy/mongodb-enterprise/5.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', + 'https://repo.mongodb.org/apt/ubuntu/dists/jammy/mongodb-org/6.0/multiverse/binary-amd64/mongodb-mongosh_0.1.0_amd64.deb', + '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/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', @@ -75,6 +81,12 @@ describe('Barque', () => { 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/5.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/redhat/8/mongodb-org/6.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', '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/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', + 'https://repo.mongodb.com/yum/redhat/9/mongodb-enterprise/5.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.org/yum/redhat/9/mongodb-org/6.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + '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/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', @@ -87,6 +99,12 @@ describe('Barque', () => { 'https://repo.mongodb.com/yum/amazon/2/mongodb-enterprise/5.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2/mongodb-org/6.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', '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/2022/mongodb-org/4.4/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.com/yum/amazon/2022/mongodb-enterprise/4.4/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.org/yum/amazon/2022/mongodb-org/5.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.com/yum/amazon/2022/mongodb-enterprise/5.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.org/yum/amazon/2022/mongodb-org/6.0/x86_64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.com/yum/amazon/2022/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/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', @@ -111,12 +129,24 @@ describe('Barque', () => { 'https://repo.mongodb.com/yum/redhat/8/mongodb-enterprise/5.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/redhat/8/mongodb-org/6.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', '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/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', + 'https://repo.mongodb.com/yum/redhat/9/mongodb-enterprise/5.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.org/yum/redhat/9/mongodb-org/6.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + '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/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', 'https://repo.mongodb.com/yum/amazon/2/mongodb-enterprise/5.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', 'https://repo.mongodb.org/yum/amazon/2/mongodb-org/6.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', '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/2022/mongodb-org/4.4/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.com/yum/amazon/2022/mongodb-enterprise/4.4/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.org/yum/amazon/2022/mongodb-org/5.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.com/yum/amazon/2022/mongodb-enterprise/5.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.org/yum/amazon/2022/mongodb-org/6.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', + 'https://repo.mongodb.com/yum/amazon/2022/mongodb-enterprise/6.0/aarch64/RPMS/mongodb-mongosh-0.1.0.el7.x86_64.rpm', ] } ] as const).forEach(({ variant, url, publishedUrls }) => { diff --git a/packages/build/src/barque.ts b/packages/build/src/barque.ts index 7fe32595b..b5be91fdf 100644 --- a/packages/build/src/barque.ts +++ b/packages/build/src/barque.ts @@ -24,8 +24,8 @@ tmp.setGracefulCleanup(); * All the possible per-Linux-distro repositories that we publish to. */ type PPARepository = - 'ubuntu1804' | 'ubuntu2004' | 'debian92' | 'debian10' | 'debian11' | - 'rhel70' | 'rhel80' | 'amazon1' | 'amazon2' | 'suse12' | 'suse15'; + 'ubuntu1804' | 'ubuntu2004' | 'ubuntu2204' | 'debian92' | 'debian10' | 'debian11' | + 'rhel70' | 'rhel80' | 'rhel90' | 'amazon1' | 'amazon2' | 'amazon2022' | 'suse12' | 'suse15'; /** * Return the full list of [distro, arch] combinations that we upload for @@ -43,19 +43,19 @@ export function getReposAndArch(packageVariant: PackageVariant): { ppas: PPARepo return { ppas: [], arch: '' }; case 'deb': return { - ppas: ['ubuntu1804', 'ubuntu2004', 'debian92', 'debian10', 'debian11'], + ppas: ['ubuntu1804', 'ubuntu2004', 'ubuntu2204', 'debian92', 'debian10', 'debian11'], arch: getDebArchName(getArch(packageVariant)) }; case 'rpm': if (getArch(packageVariant) === 'x64') { return { - ppas: ['rhel70', 'rhel80', 'amazon1', 'amazon2', 'suse12', 'suse15'], + ppas: ['rhel70', 'rhel80', 'rhel90', 'amazon1', 'amazon2', 'amazon2022', 'suse12', 'suse15'], arch: getRPMArchName(getArch(packageVariant)) }; } if (getArch(packageVariant) === 'arm64') { return { - ppas: ['rhel80', 'amazon2'], + ppas: ['rhel80', 'rhel90', 'amazon2', 'amazon2022'], arch: getRPMArchName(getArch(packageVariant)) }; } @@ -202,13 +202,16 @@ export class Barque { /* eslint-disable no-multi-spaces */ case 'ubuntu1804': return `${base}/apt/ubuntu/dists/bionic/mongodb-${edition}/${packageFolderVersion}/multiverse/binary-${targetArchitecture}/${packageFileName}`; case 'ubuntu2004': 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 'debian92': return `${base}/apt/debian/dists/buster/mongodb-${edition}/${packageFolderVersion}/main/binary-${targetArchitecture}/${packageFileName}`; case 'debian10': return `${base}/apt/debian/dists/stretch/mongodb-${edition}/${packageFolderVersion}/main/binary-${targetArchitecture}/${packageFileName}`; case 'debian11': return `${base}/apt/debian/dists/bullseye/mongodb-${edition}/${packageFolderVersion}/main/binary-${targetArchitecture}/${packageFileName}`; case 'rhel70': return `${base}/yum/redhat/7/mongodb-${edition}/${packageFolderVersion}/${targetArchitecture}/RPMS/${packageFileName}`; case 'rhel80': return `${base}/yum/redhat/8/mongodb-${edition}/${packageFolderVersion}/${targetArchitecture}/RPMS/${packageFileName}`; + case 'rhel90': return `${base}/yum/redhat/9/mongodb-${edition}/${packageFolderVersion}/${targetArchitecture}/RPMS/${packageFileName}`; case 'amazon1': return `${base}/yum/amazon/2013.03/mongodb-${edition}/${packageFolderVersion}/${targetArchitecture}/RPMS/${packageFileName}`; case 'amazon2': return `${base}/yum/amazon/2/mongodb-${edition}/${packageFolderVersion}/${targetArchitecture}/RPMS/${packageFileName}`; + case 'amazon2022': return `${base}/yum/amazon/2022/mongodb-${edition}/${packageFolderVersion}/${targetArchitecture}/RPMS/${packageFileName}`; case 'suse12': return `${base}/zypper/suse/12/mongodb-${edition}/${packageFolderVersion}/${targetArchitecture}/RPMS/${packageFileName}`; case 'suse15': return `${base}/zypper/suse/15/mongodb-${edition}/${packageFolderVersion}/${targetArchitecture}/RPMS/${packageFileName}`; /* eslint-enable no-multi-spaces */ diff --git a/scripts/docker/rocky9-rpm.Dockerfile b/scripts/docker/rocky9-rpm.Dockerfile new file mode 100644 index 000000000..847ab5766 --- /dev/null +++ b/scripts/docker/rocky9-rpm.Dockerfile @@ -0,0 +1,13 @@ +FROM rockylinux:9 + +ARG artifact_url="" +ADD ${artifact_url} /tmp +ADD node_modules /usr/share/mongodb-crypt-library-version/node_modules +RUN dnf repolist +RUN dnf install -y man +RUN dnf install -y /tmp/*mongosh*.rpm +RUN /usr/bin/mongosh --build-info +RUN env MONGOSH_RUN_NODE_SCRIPT=1 mongosh /usr/share/mongodb-crypt-library-version/node_modules/.bin/mongodb-crypt-library-version /usr/lib64/mongosh_crypt_v1.so | grep -Eq '^mongo_(crypt|csfle)_v1-' +RUN man mongosh | grep -q tlsAllowInvalidCertificates +ENV MONGOSH_SMOKE_TEST_OS_HAS_FIPS_SUPPORT=1 +ENTRYPOINT [ "mongosh" ] From 60c7c56f3f9622629f46b2cda2c198c3c986a963 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Tue, 19 Jul 2022 14:19:24 +0200 Subject: [PATCH 2/2] fixup: skip rocky9 openssl3 fips smoke test --- scripts/docker/rocky9-rpm.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker/rocky9-rpm.Dockerfile b/scripts/docker/rocky9-rpm.Dockerfile index 847ab5766..4220f7e6a 100644 --- a/scripts/docker/rocky9-rpm.Dockerfile +++ b/scripts/docker/rocky9-rpm.Dockerfile @@ -9,5 +9,5 @@ RUN dnf install -y /tmp/*mongosh*.rpm RUN /usr/bin/mongosh --build-info RUN env MONGOSH_RUN_NODE_SCRIPT=1 mongosh /usr/share/mongodb-crypt-library-version/node_modules/.bin/mongodb-crypt-library-version /usr/lib64/mongosh_crypt_v1.so | grep -Eq '^mongo_(crypt|csfle)_v1-' RUN man mongosh | grep -q tlsAllowInvalidCertificates -ENV MONGOSH_SMOKE_TEST_OS_HAS_FIPS_SUPPORT=1 +ENV MONGOSH_SMOKE_TEST_OS_SKIP_FIPS_WITH_OPENSSL3=1 ENTRYPOINT [ "mongosh" ]