Merge pull request #930 from jenkins-infra/improve-renovate

Upgrade renovate config so it handles node, and ignores remark
jenkins-infra · Dec 18, 2021 · b1ce0c3 · b1ce0c3
2 parents b084ec6 + f1d34fe
commit b1ce0c3
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 21 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+16.13.1
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -2,6 +2,7 @@ pipeline {
   environment {
     GET_CONTENT = "true"
     NODE_ENV = "production"
+    HOME = "/tmp"
     TZ = "UTC"
   }
 
@@ -18,42 +19,52 @@ pipeline {
   stages {
 
     stage('NPM Install') {
+      agent {
+        docker {
+          image 'node:14.17'
+          reuseNode true
+        }
+      }
       steps {
-        runDockerCommand('node:14.17',  'yarn install')
+        sh('yarn install')
       }
     }
 
     stage('Build Production') {
+      agent {
+        docker {
+          image 'node:14.17'
+          reuseNode true
+        }
+      }
       steps {
-        runDockerCommand('node:14.17',  'yarn build')
+        sh('yarn build')
       }
     }
 
     stage('Check build') {
+      agent {
+        docker {
+          image 'node:14.17'
+          reuseNode true
+        }
+      }
       steps {
         sh 'test -e ./plugins/plugin-site/public/index.html || exit 1'
       }
     }
 
     stage('Lint and Test') {
+      agent {
+        docker {
+          image 'node:14.17'
+          reuseNode true
+        }
+      }
       steps {
-        runDockerCommand('node:14.17',  'yarn lint')
-        runDockerCommand('node:14.17',  'yarn test')
+        sh('yarn lint')
+        sh('yarn test')
       }
     }
   }
 }
-
-def runDockerCommand(image, cmd) {
-  sh """
-    docker run \
-      --network host \
-      --rm -e GET_CONTENT \
-      -w "\$PWD" \
-      -e HOME="/tmp" \
-      -v "\$PWD:\$PWD" \
-      -u \$(id -u):\$(id -g) \
-      $image \
-      $cmd
-  """
-}
diff --git a/renovate.json b/renovate.json
@@ -5,14 +5,55 @@
     "schedule": [
         "every weekday"
     ],
-    "labels": ["dependencies"],
+    "labels": [
+        "dependencies"
+    ],
+    "npm": {
+        "stabilityDays": 3
+    },
+    "regexManagers": [
+        {
+            "fileMatch": [
+                "^Jenkinsfile$",
+                "^Jenkinsfile_k8s$"
+            ],
+            "matchStrings": [
+                "image '(?<depName>[a-z/-]+):(?<currentValue>[a-z0-9.-]+)@(?<currentDigest>sha256:[a-f0-9]+)'",
+                "image: \"(?<depName>[a-z/-]+):(?<currentValue>[a-z0-9.-]+)@(?<currentDigest>sha256:[a-f0-9]+)\""
+            ],
+            "datasourceTemplate": "docker",
+            "versioningTemplate": "docker"
+        }
+    ],
     "packageRules": [
         {
-            "matchPackageNames": ["p-queue", "husky"],
+            "matchPackageNames": [
+                "node"
+            ],
+            "major": {
+                "enabled": true
+            },
+            "separateMultipleMajor": true,
+            "allowedVersions": "^14 || ^16 || ^18 || ^20"
+        },
+        {
+            "extends": "monorepo:remark",
+            "enabled": false
+        },
+        {
+            "matchPackageNames": [
+                "p-queue",
+                "husky"
+            ],
             "enabled": false
         },
         {
-            "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
+            "matchUpdateTypes": [
+                "minor",
+                "patch",
+                "pin",
+                "digest"
+            ],
             "automerge": true
         }
     ]