diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10b8dedbf..808d2e09e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false matrix: - psmdb: ["4.2", "4.4", "5.0", "6.0"] + psmdb: ["4.4", "5.0", "6.0"] test: [logical, physical, incremental, external] env: PBM_BRANCH: ${{ github.event.inputs.pbm_branch || 'main' }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1e48a0069..befa2ab9a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,16 +6,16 @@ Welcome to Percona Backup for MongoDB! 2. [Submitting a pull request](#submitting-a-pull-request) 3. [Contributing to documentation](#contributing-to-documentation) -We're glad that you would like to become a Percona community member and participate in keeping open source open. +We're glad that you would like to become a Percona community member and participate in keeping open source open. Percona Backup for MongoDB (PBM) is a distributed, low-impact solution for achieving consistent backups of MongoDB sharded clusters and replica sets. You can contribute in one of the following ways: 1. Reach us on our [Forums](https://forums.percona.com) and [Discord]([https://discord.gg/mQEyGPkNbR](https://discord.gg/mQEyGPkNbR)). -2. [Submit a bug report or a feature request](https://github.com/percona/percona-backup-mongodb/blob/main/README.md) +2. [Submit a bug report or a feature request](https://github.com/percona/percona-backup-mongodb/blob/main/README.md) 3. Submit a pull request (PR) with the code patch -4. Contribute to documentation +4. Contribute to documentation ## Prerequisites @@ -33,20 +33,20 @@ Please make sure to read and agree to our [Code of Conduct](https://github.com/p ## Submitting a pull request -All bug reports, enhancements and feature requests are tracked in [Jira issue tracker](https://jira.percona.com/projects/PBM). Though not mandatory, we encourage you to first check for a bug report among Jira issues and in the PR list: perhaps the bug has already been addressed. +All bug reports, enhancements and feature requests are tracked in [Jira issue tracker](https://jira.percona.com/projects/PBM). Though not mandatory, we encourage you to first check for a bug report among Jira issues and in the PR list: perhaps the bug has already been addressed. For feature requests and enhancements, we do ask you to create a Jira issue, describe your idea and discuss the design with us. This way we align your ideas with our vision for the product development. If the bug hasn’t been reported / addressed, or we’ve agreed on the enhancement implementation with you, do the following: 1. [Fork](https://docs.github.com/en/github/getting-started-with-github/fork-a-repo) this repository -2. Clone this repository on your machine. +2. Clone this repository on your machine. 3. Create a separate branch for your changes. If you work on a Jira issue, please include the issue number in the branch name so it reads as ``-my_branch``. This makes it easier to track your contribution. 4. Make your changes. Please follow the guidelines outlined in the [Go Code Review Comments](https://github.com/golang/go/wiki/CodeReviewComments) to improve code readability. 5. Test your changes locally. See the [Running tests locally](#running-tests-locally) section for more information 6. Commit the changes. Add the Jira issue number at the beginning of your message subject so that is reads as ` - My subject`. The [commit message guidelines](https://gist.github.com/robertpainsi/b632364184e70900af4ab688decf6f53) will help you with writing great commit messages 7. Open a PR to Percona -8. Our team will review your code and if everything is correct, will merge it. +8. Our team will review your code and if everything is correct, will merge it. Otherwise, we will contact you for additional information or with the request to make changes. ### Building Percona Backup for MongoDB @@ -104,7 +104,7 @@ To save time on tests execution during development, we recommend running genera $ MONGODB_VERSION=4.4 ./run-sharded ``` -``$ MONGODB_VERSION`` stands for the Percona Server for MongoDB version Percona Backup for MongoDB is running with. Default is 4.2. +``$ MONGODB_VERSION`` stands for the Percona Server for MongoDB version Percona Backup for MongoDB is running with. Default is 4.4. After the development is complete and you are ready to submit a pull request, run all tests using the following command: @@ -116,9 +116,9 @@ You can run tests on your local machine with whatever operating system you have. ## Contributing to documentation -We welcome contributions to our [documentation](https://docs.percona.com/percona-backup-mongodb/index.html). +We welcome contributions to our [documentation](https://docs.percona.com/percona-backup-mongodb/index.html). -Documentation source files are in the [dedicated docs repository](https://github.com/percona/pbm-docs). The contents of the `doc` folder is outdated and will be removed. +Documentation source files are in the [dedicated docs repository](https://github.com/percona/pbm-docs). The contents of the `doc` folder is outdated and will be removed. Please follow the [Docs contributing guidelines](https://github.com/percona/pbm-docs/CONTRBUTING.md) for how to contribute to documentation. diff --git a/Jenkinsfile b/Jenkinsfile index 09f32b5b7..5c8da2ed6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -83,21 +83,6 @@ pipeline { } } parallel { - stage('New cluster 4.2 logical') { - agent { - label 'docker' - } - steps { - script { - if ( AUTHOR_NAME == 'null' ) { - AUTHOR_NAME = sh(script: "git show -s --pretty=%ae | awk -F'@' '{print \$1}'", , returnStdout: true).trim() - } - } - - prepareCluster('sharded', '42-newc-logic', '4.2') - runTest('New cluster', 'run-new-cluster', '4.2', 'logical') - } - } stage('New cluster 4.4 logical') { agent { label 'docker' @@ -126,15 +111,6 @@ pipeline { } } - stage('Sharded 4.2 logical') { - agent { - label 'docker-32gb' - } - steps { - prepareCluster('sharded', '42-shrd-logic', '4.2') - runTest('Sharded', 'run-sharded', '4.2', 'logical') - } - } stage('Sharded 4.4 logical') { agent { label 'docker-32gb' @@ -163,15 +139,6 @@ pipeline { } } - stage('Non-sharded 4.2 logical') { - agent { - label 'docker' - } - steps { - prepareCluster('rs', '42-rs-logic', '4.2') - runTest('Non-sharded', 'run-rs', '4.2', 'logical') - } - } stage('Non-sharded 4.4 logical') { agent { label 'docker' @@ -200,15 +167,6 @@ pipeline { } } - stage('Single-node 4.2 logical') { - agent { - label 'docker' - } - steps { - prepareCluster('single', '42-single-logic', '4.2') - runTest('Single-node', 'run-single', '4.2', 'logical') - } - } stage('Single-node 4.4 logical') { agent { label 'docker' @@ -237,15 +195,6 @@ pipeline { } } - stage('Sharded 4.2 physical') { - agent { - label 'docker-32gb' - } - steps { - prepareCluster('sharded', '42-shrd-phys', '4.2') - runTest('Sharded', 'run-sharded', '4.2', 'physical') - } - } stage('Sharded 4.4 physical') { agent { label 'docker-32gb' @@ -274,15 +223,6 @@ pipeline { } } - stage('Non-sharded 4.2 physical') { - agent { - label 'docker' - } - steps { - prepareCluster('rs', '42-rs-phys', '4.2') - runTest('Non-sharded', 'run-rs', '4.2', 'physical') - } - } stage('Non-sharded 4.4 physical') { agent { label 'docker' @@ -311,15 +251,6 @@ pipeline { } } - stage('Single-node 4.2 physical') { - agent { - label 'docker' - } - steps { - prepareCluster('single', '42-single-phys', '4.2') - runTest('Single-node', 'run-single', '4.2', 'physical') - } - } stage('Single-node 4.4 physical') { agent { label 'docker' diff --git a/Makefile b/Makefile index 1b270ba9e..b882a44e1 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ CGO_ENABLED?=0 GITCOMMIT?=$(shell git rev-parse HEAD 2>/dev/null) GITBRANCH?=$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) BUILDTIME?=$(shell TZ=UTC date "+%Y-%m-%d_%H:%M_UTC") -MONGO_TEST_VERSION?=4.2 +MONGO_TEST_VERSION?=4.4 define ENVS GO111MODULE=$(GOMOD) \ diff --git a/README.md b/README.md index 31552cee9..b256b1701 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ![PBM logo](doc/source/images/backup-mongo.jpeg) Percona Backup for MongoDB (PBM) is a distributed, low-impact solution for achieving -consistent backups of MongoDB sharded clusters and replica sets. Percona Backup for MongoDB supports Percona Server for MongoDB and MongoDB Community Edition v3.6 and higher. +consistent backups of MongoDB sharded clusters and replica sets. Percona Backup for MongoDB supports Percona Server for MongoDB and MongoDB Community Edition v4.4 and higher. For more information about PBM components and how to use it, see [Percona Backup for MongoDB documentation](https://docs.percona.com/percona-backup-mongodb/) @@ -80,7 +80,7 @@ When submitting a bug report or a feature, please attach the following informati ## Licensing -Percona is dedicated to **keeping open source open**. Wherever possible, we strive to include permissive licensing for both our software and documentation. For this project, we are using the Apache License 2.0 license. +Percona is dedicated to **keeping open source open**. Wherever possible, we strive to include permissive licensing for both our software and documentation. For this project, we are using the Apache License 2.0 license. ## How to get involved