chore(release): merge branch 'release/1.0.2'

Author: GlennBullingham

.github/auto_assign.yml

@@ -8,12 +8,11 @@ addAssignees: false
 reviewers:
   - blaisedias
   - chriswldenyer
-  - cjones1024
-  - gila
   - jonathan-teh
   - paulyoong
   - tiagolobocastro
   - mtzaurus
+  - dsavitskiy
 
 # A list of keywords to be skipped the process that add reviewers if pull requests include it
 skipKeywords:

.github/workflows/pr-commitlint.yml

@@ -2,6 +2,9 @@ name: Lint Commit Messages
 on:
   pull_request:
     types: ['opened', 'edited', 'reopened', 'synchronize']
+  push:
+    branches:
+      - staging
 
 jobs:
   commitlint:
@@ -14,6 +17,9 @@ jobs:
         run: npm install @commitlint/config-conventional @commitlint/cli
       - name: Lint Commits
         run: |
-          first_commit=$(curl ${{ github.event.pull_request.commits_url }} 2>/dev/null | jq '.[0].sha' | sed 's/"//g')
-          last_commit=HEAD^2 # don't lint the merge commit
-          npx commitlint --from $first_commit~1 --to $last_commit -V
+          # Only run for PR's and simply succeed the bors staging branch
+          if [ ! ${{ github.ref }} = "refs/heads/staging" ]; then
+            first_commit=${{ github.event.pull_request.base.sha }}
+            last_commit=${{ github.event.pull_request.head.sha }}
+            npx commitlint --from $first_commit --to $last_commit -V
+          fi

.gitignore

@@ -18,9 +18,21 @@ artifacts/
 **/__pycache__
 /chart/charts/
 ansible-hosts
+/test/python/common_pb2.py
+/test/python/common_pb2_grpc.py
 /test/python/csi_pb2.py
 /test/python/csi_pb2_grpc.py
 /test/python/mayastor_pb2.py
 /test/python/mayastor_pb2_grpc.py
+/test/python/pool_pb2.py
+/test/python/pool_pb2_grpc.py
+/test/python/bdev_pb2.py
+/test/python/bdev_pb2_grpc.py
+/test/python/host_pb2.py
+/test/python/host_pb2_grpc.py
+/test/python/nexus_pb2.py
+/test/python/nexus_pb2_grpc.py
+/test/python/replica_pb2.py
+/test/python/replica_pb2_grpc.py
 /test/python/venv/*
 /package.json

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "rpc/mayastor-api"]
 	path = rpc/mayastor-api
 	url = https://github.com/openebs/mayastor-api
+[submodule "spdk-rs"]
+	path = spdk-rs
+	url = https://github.com/mayadata-io/spdk-rs
+[submodule "utils/mayastor-dependencies"]
+	path = utils/mayastor-dependencies
+	url = https://github.com/openebs/mayastor-dependencies.git

.pre-commit-config.yaml

@@ -7,19 +7,20 @@ repos:
     rev: v4.0.1
     hooks:
     -   id: trailing-whitespace
+        exclude_types: [diff]
 -   repo: local
     hooks:
     -   id: rust-style
         name: Rust style
-        description: Run cargo fmt on files included in the commit. rustfmt should be installed before-hand.
-        entry: cargo fmt --all -- --check
+        description: Check Rust code style on files included in the commit.
+        entry: ./scripts/rust-style.sh
         pass_filenames: true
         types: [file, rust]
         language: system
     -   id: rust-lint
         name: Rust lint
-        description: Run cargo clippy on files included in the commit. clippy should be installed before-hand.
-        entry: cargo clippy --all --all-targets -- -D warnings
+        description: Run Rust linter on files included in the commit.
+        entry: ./scripts/rust-linter.sh
         pass_filenames: false
         types: [file, rust]
         language: system
@@ -44,3 +45,9 @@ repos:
         pass_filenames: true
         types: [file, python]
         language: system
+    -   id: helm-deploy
+        name: Helm Generator
+        description: Ensures the deploy is updated with the helm chart
+        entry: ./scripts/check-deploy-yamls.sh
+        pass_filenames: false
+        language: system

Cargo.lock

@@ -11,10 +11,13 @@ members = [
 	"csi",
 	"devinfo",
 	"jsonrpc",
+	"libnvme-rs",
 	"mayastor",
 	"mbus-api",
 	"nvmeadm",
 	"rpc",
 	"sysfs",
 	"composer",
+	"spdk-rs",
+	"utils/mayastor-dependencies/version-info",
 ]

Cargo.toml

@@ -183,9 +183,20 @@ pipeline {
         checkout([
           $class: 'GitSCM',
           branches: scm.branches,
-          extensions: scm.extensions.findAll{!(it instanceof jenkins.plugins.git.GitSCMSourceDefaults)} + [
-            [$class: 'CloneOption', noTags: false, reference: '', shallow: false],
-          ],
+          extensions: scm.extensions.findAll {
+            !(it instanceof jenkins.plugins.git.GitSCMSourceDefaults)
+          } + [[
+            $class: 'CloneOption',
+            noTags: false,
+            reference: '', shallow: false
+          ], [
+            $class: 'SubmoduleOption',
+            disableSubmodules: false,
+            parentCredentials: true,
+            recursiveSubmodules: true,
+            reference: '',
+            trackingSubmodules: false
+          ]],
           userRemoteConfigs: scm.userRemoteConfigs
         ])
         stash name: 'source', useDefaultExcludes: false
@@ -206,17 +217,17 @@ pipeline {
         not {
           anyOf {
             branch 'master'
-            branch 'release/*'
             expression { run_linter == false }
           }
         }
       }
       steps {
         cleanWs()
         unstash 'source'
-        sh 'nix-shell --run "cargo fmt --all -- --check" ci.nix'
-        sh 'nix-shell --run "cargo clippy --all-targets -- -D warnings" ci.nix'
+        sh 'nix-shell --run "./scripts/rust-style.sh" ci.nix'
+        sh 'nix-shell --run "./scripts/rust-linter.sh" ci.nix'
         sh 'nix-shell --run "./scripts/js-check.sh" ci.nix'
+        sh 'nix-shell --run "./scripts/check-deploy-yamls.sh" ci.nix'
       }
     }
     stage('test') {
@@ -225,7 +236,6 @@ pipeline {
         not {
           anyOf {
             branch 'master'
-            branch 'release/*'
           }
         }
       }
@@ -288,7 +298,21 @@ pipeline {
                 checkout([
                   $class: 'GitSCM',
                   branches: scm.branches,
-                  extensions: scm.extensions.findAll{!(it instanceof jenkins.plugins.git.GitSCMSourceDefaults)} + [[$class: 'CloneOption', noTags: false, reference: '', shallow: false]],
+                  extensions: scm.extensions.findAll {
+                    !(it instanceof jenkins.plugins.git.GitSCMSourceDefaults)
+                  } + [[
+                    $class: 'CloneOption',
+                    noTags: false,
+                    reference: '',
+                    shallow: false
+                  ], [
+                    $class: 'SubmoduleOption',
+                    disableSubmodules: false,
+                    parentCredentials: true,
+                    recursiveSubmodules: true,
+                    reference: '',
+                    trackingSubmodules: false
+                  ]],
                   userRemoteConfigs: scm.userRemoteConfigs
                 ])
               }
@@ -307,6 +331,9 @@ pipeline {
             stage('run tests') {
               steps {
                 sh 'printenv'
+                // Cleanup any existing containers.
+                // They could be lingering if there were previous test failures.
+                sh 'docker system prune -f'
                 sh 'nix-shell --run "./scripts/pytest-tests.sh" ci.nix'
               }
             }
@@ -551,11 +578,16 @@ pipeline {
           anyOf {
             branch 'master'
             branch 'release/*'
+            branch 'release-*'
             branch 'develop'
           }
         }
       }
       steps {
+        // Clean the workspace and unstash the source to ensure we build and push the correct images.
+        cleanWs()
+        unstash 'source'
+
         withCredentials([usernamePassword(credentialsId: 'dockerhub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
           sh 'echo $PASSWORD | docker login -u $USERNAME --password-stdin'
         }

Jenkinsfile

@@ -1,4 +1,5 @@
 status = [ "continuous-integration/jenkins/branch" ]
+pr_status = [ "commitlint" ]
 timeout_sec = 10000
 required_approvals = 2
 delete_merged_branches = true

bors.toml

@@ -1,6 +1,6 @@
 dependencies:
 - name: etcd
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
   version: 6.2.3
-digest: sha256:55e97f18b7a20c3e6b642eaaf47bff88d498b86cae7f7a27c4325115d98b1c92
-generated: "2021-05-13T18:47:32.999686768+01:00"
+digest: sha256:90678c4c1f7298999b2122aac56ca7dbed6861c52448ce5a3ced2b25965cfeba
+generated: "2022-06-07T19:27:21.288544846+01:00"

chart/Chart.lock

@@ -6,7 +6,7 @@ version: 0.0.1
 # appVersion: "latest"
 dependencies:
   - name: etcd
-    repository: https://charts.bitnami.com/bitnami
+    repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
     tags:
       - bitnami-etcd
     version: 6.2.3