Prepare for 1.11.0 development

Signed-off-by: Joe Stringer <[email protected]>
pmaddev · Apr 27, 2021 · 4d52791 · 4d52791
1 parent 4e17505
commit 4d52791
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/.github/cilium-actions.yml b/.github/cilium-actions.yml
@@ -1,6 +1,16 @@
-project: "https://github.com/cilium/cilium/projects/131"
+project: "https://github.com/cilium/cilium/projects/155"
 column: "In progress"
 move-to-projects-for-labels-xored:
+  v1.10:
+    needs-backport/1.10:
+      project: "https://github.com/cilium/cilium/projects/154"
+      column: "Needs backport from master"
+    backport-pending/1.10:
+      project: "https://github.com/cilium/cilium/projects/154"
+      column: "Backport pending to v1.10"
+    backport-done/1.10:
+      project: "https://github.com/cilium/cilium/projects/154"
+      column: "Backport done to v1.10"
   v1.9:
     needs-backport/1.9:
       project: "https://github.com/cilium/cilium/projects/153"
@@ -21,16 +31,6 @@ move-to-projects-for-labels-xored:
     backport-done/1.8:
       project: "https://github.com/cilium/cilium/projects/152"
       column: "Backport done to v1.8"
-  v1.7:
-    needs-backport/1.7:
-      project: "https://github.com/cilium/cilium/projects/151"
-      column: "Needs backport from master"
-    backport-pending/1.7:
-      project: "https://github.com/cilium/cilium/projects/151"
-      column: "Backport pending to v1.7"
-    backport-done/1.7:
-      project: "https://github.com/cilium/cilium/projects/151"
-      column: "Backport done to v1.7"
 require-msgs-in-commit:
   - msg: "Signed-off-by"
     helper: "https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin"

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -31,7 +31,7 @@ updates:
     directory: /
     schedule:
       interval: daily
-    target-branch: "v1.9"
+    target-branch: "v1.10"
     open-pull-requests-limit: 1
     rebase-strategy: "disabled"
     labels:
@@ -42,7 +42,7 @@ updates:
     directory: /
     schedule:
       interval: daily
-    target-branch: "v1.8"
+    target-branch: "v1.9"
     open-pull-requests-limit: 1
     rebase-strategy: "disabled"
     labels:
@@ -53,7 +53,7 @@ updates:
     directory: /
     schedule:
       interval: daily
-    target-branch: "v1.7"
+    target-branch: "v1.8"
     open-pull-requests-limit: 1
     rebase-strategy: "disabled"
     labels:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -4,9 +4,9 @@ on:
   push:
     branches:
     - master
+    - v1.10
     - v1.9
     - v1.8
-    - v1.7
   pull_request:
     branches:
     - master

diff --git a/Documentation/contributing/testing/ci.rst b/Documentation/contributing/testing/ci.rst
@@ -178,12 +178,12 @@ them all at once:
 +==================+==========================+
 | master           | test-me-please           |
 +------------------+--------------------------+
+| v1.10            | test-backport-1.10       |
++------------------+--------------------------+
 | v1.9             | test-backport-1.9        |
 +------------------+--------------------------+
 | v1.8             | test-backport-1.8        |
 +------------------+--------------------------+
-| v1.7             | test-backport-1.7        |
-+------------------+--------------------------+
 
 For ``master`` PRs: on top of ``test-me-please``, one may use 
 ``test-missed-k8s`` to trigger all non-required K8s versions on Kernel 4.9 as

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.9.90
+1.10.90
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,9 +4,9 @@ on: @@
       push:
         branches:
         - master
+        - v1.10
         - v1.9
         - v1.8
-        - v1.7
       pull_request:
         branches:
         - master
@@ Expand Down @@