Merge changes If1fc1f26,I4ac1e3fc

* changes:
  Remove aaa-0.18.x jobs
  Add aaa-0.20.x jobs

jjb/aaa/aaa.yaml

@@ -24,22 +24,21 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-0.19.x
+    name: aaa-0.20.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
           project-pattern: aaa
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
           rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
-      - odl-maven-jobs-jdk17
-      - odl-maven-verify-jobs-jdk17
-      - odl-maven-verify-jobs-jdk21:
-          build-node: ubuntu2004-docker-4c-4g
+      - odl-maven-jobs-jdk21
+      - odl-maven-verify-jobs-jdk21
 
     project: aaa
     project-name: aaa
-    branch: 0.19.x
-    stream: 0.19.x
+    branch: 0.20.x
+    stream: 0.20.x
+    build-node: ubuntu2004-docker-4c-4g
 
     mvn-settings: "aaa-settings"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
@@ -49,7 +48,7 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-0.18.x
+    name: aaa-0.19.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
@@ -58,11 +57,14 @@
           rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
+      - odl-maven-verify-jobs-jdk21:
+          build-node: ubuntu2004-docker-4c-4g
 
     project: aaa
     project-name: aaa
-    branch: 0.18.x
-    stream: 0.18.x
+    branch: 0.19.x
+    stream: 0.19.x
+
     mvn-settings: "aaa-settings"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
     email-upstream: "[aaa] [odlparent] [yangtools] [controller]"