Add netconf streams

Currently netconf has CSIT jobs for only one stream, 'master', hence no system integration tests are run for the stable branches. Add the test jobs for other supported streams, potassium & calcium, and rename 'master' to 'scandium' to make the naming consistent with other CSIT jobs for MRI projects. This patch also introduces 'integration-distribution-branch' to the job-templates such as 'integration-distribution-test-{stream}' that triggers downstream CSIT jobs. This allows the netconf CSIT jobs to be run for its own karaf artifact or the karaf artifact created by integration/distribution based on KARAF_VERSION & DISTROBRANCH. Change-Id: I961d0d5230726fcb5bcc13de9e6bef8a354c53bb Signed-off-by: Sangwook Ha <[email protected]>
opendaylight · Jul 5, 2024 · 6bec381 · 6bec381
1 parent 2f6c558
commit 6bec381
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 24 deletions.
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
@@ -225,12 +225,12 @@
       controller-csit-3node-rest-clust-cars-perf-ask-only-potassium,
       controller-csit-3node-rest-clust-cars-perf-tell-only-potassium,
       mdsal-csit-3node-netty-replicate-only-potassium,
-      netconf-csit-1node-callhome-only-master,
-      netconf-csit-1node-scale-max-devices-only-master,
-      netconf-csit-1node-scale-only-master,
-      netconf-csit-1node-userfeatures-all-master,
-      netconf-csit-3node-clustering-only-master,
-      netconf-csit-3node-clustering-scale-only-master,
+      netconf-csit-1node-callhome-only-potassium,
+      netconf-csit-1node-scale-max-devices-only-potassium,
+      netconf-csit-1node-scale-only-potassium,
+      netconf-csit-1node-userfeatures-all-potassium,
+      netconf-csit-3node-clustering-only-potassium,
+      netconf-csit-3node-clustering-scale-only-potassium,
       yangtools-csit-1node-system-only-postassium
     csit-weekly-list-potassium: >
       controller-csit-1node-notifications-longevity-only-potassium,
@@ -253,12 +253,12 @@
       controller-csit-3node-rest-clust-cars-perf-ask-only-calcium,
       controller-csit-3node-rest-clust-cars-perf-tell-only-calcium,
       mdsal-csit-3node-netty-replicate-only-calcium,
-      netconf-csit-1node-callhome-only-master,
-      netconf-csit-1node-scale-max-devices-only-master,
-      netconf-csit-1node-scale-only-master,
-      netconf-csit-1node-userfeatures-all-master,
-      netconf-csit-3node-clustering-only-master,
-      netconf-csit-3node-clustering-scale-only-master,
+      netconf-csit-1node-callhome-only-calcium,
+      netconf-csit-1node-scale-max-devices-only-calcium,
+      netconf-csit-1node-scale-only-calcium,
+      netconf-csit-1node-userfeatures-all-calcium,
+      netconf-csit-3node-clustering-only-calcium,
+      netconf-csit-3node-clustering-scale-only-calcium,
       yangtools-csit-1node-system-only-calcium
     csit-weekly-list-calcium: >
       controller-csit-1node-notifications-longevity-only-calcium,
@@ -281,12 +281,12 @@
       controller-csit-3node-rest-clust-cars-perf-ask-only-scandium,
       controller-csit-3node-rest-clust-cars-perf-tell-only-scandium,
       mdsal-csit-3node-netty-replicate-only-scandium,
-      netconf-csit-1node-callhome-only-master,
-      netconf-csit-1node-scale-max-devices-only-master,
-      netconf-csit-1node-scale-only-master,
-      netconf-csit-1node-userfeatures-all-master,
-      netconf-csit-3node-clustering-only-master,
-      netconf-csit-3node-clustering-scale-only-master,
+      netconf-csit-1node-callhome-only-scandium,
+      netconf-csit-1node-scale-max-devices-only-scandium,
+      netconf-csit-1node-scale-only-scandium,
+      netconf-csit-1node-userfeatures-all-scandium,
+      netconf-csit-3node-clustering-only-scandium,
+      netconf-csit-3node-clustering-scale-only-scandium,
       yangtools-csit-1node-system-only-scandium
     csit-weekly-list-scandium: >
       controller-csit-1node-notifications-longevity-only-scandium,

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
@@ -184,6 +184,8 @@
           bundle-url: "{bundle-url}"
       - distribution-karaf-version:
           karaf-version: "{karaf-version}"
+      - integration-distribution-branch:
+          branch: "{branch}"
 
     builders:
       - lf-infra-pre-build
@@ -193,6 +195,7 @@
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
+              DISTROBRANCH=$DISTROBRANCH
 
     wrappers:
       - lf-infra-wrappers:
@@ -224,6 +227,8 @@
           bundle-url: "{bundle-url}"
       - distribution-karaf-version:
           karaf-version: "{karaf-version}"
+      - integration-distribution-branch:
+          branch: "{branch}"
 
     triggers:
       - timed: "{schedule-daily}"
@@ -236,6 +241,7 @@
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
+              DISTROBRANCH=$DISTROBRANCH
 
     publishers:
       - email-notification:
@@ -348,6 +354,7 @@
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
+              DISTROBRANCH=$DISTROBRANCH
 
     publishers:
       - lf-infra-publish
@@ -454,6 +461,7 @@
                   predefined-parameters: |
                     BUNDLE_URL=$BUNDLE_URL
                     KARAF_VERSION=$KARAF_VERSION
+                    DISTROBRANCH=$DISTROBRANCH
 
     publishers:
       - lf-infra-publish
@@ -476,6 +484,8 @@
           bundle-url: "{bundle-url}"
       - distribution-karaf-version:
           karaf-version: "{karaf-version}"
+      - integration-distribution-branch:
+          branch: "{branch}"
 
     triggers:
       - timed: "{schedule-weekly}"
@@ -487,6 +497,7 @@
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
+              DISTROBRANCH=$DISTROBRANCH
 
     publishers:
       - email-notification:
@@ -509,6 +520,8 @@
           bundle-url: "{bundle-url}"
       - distribution-karaf-version:
           karaf-version: "{karaf-version}"
+      - integration-distribution-branch:
+          branch: "{branch}"
 
     triggers:
       - timed: "{schedule-weekly}"
@@ -520,6 +533,7 @@
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
+              DISTROBRANCH=$DISTROBRANCH
 
     publishers:
       - email-notification:
@@ -541,6 +555,8 @@
           bundle-url: "{bundle-url}"
       - distribution-karaf-version:
           karaf-version: "{karaf-version}"
+      - integration-distribution-branch:
+          branch: "{branch}"
 
     triggers:
       - timed: "{schedule-weekly}"
@@ -552,6 +568,7 @@
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
+              DISTROBRANCH=$DISTROBRANCH
 
     publishers:
       - email-notification:

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
@@ -12,9 +12,15 @@
 
     # Project branches
     stream:
-      - master:
+      - scandium:
           branch: "master"
           jre: "openjdk17"
+      - calcium:
+          branch: "7.0.x"
+          jre: "openjdk17"
+      - potassium:
+          branch: "6.0.x"
+          jre: "openjdk17"
 
     karaf-version: netconf
 

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
@@ -12,9 +12,15 @@
 
     # Project branches
     stream:
-      - master:
+      - scandium:
           branch: "master"
           jre: "openjdk17"
+      - calcium:
+          branch: "7.0.x"
+          jre: "openjdk17"
+      - potassium:
+          branch: "6.0.x"
+          jre: "openjdk17"
 
     karaf-version: netconf
 

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
@@ -14,9 +14,15 @@
 
     # Project branches
     stream:
-      - master:
+      - scandium:
           branch: "master"
           jre: "openjdk17"
+      - calcium:
+          branch: "7.0.x"
+          jre: "openjdk17"
+      - potassium:
+          branch: "6.0.x"
+          jre: "openjdk17"
 
     karaf-version: netconf
 

diff --git a/jjb/netconf/netconf-distribution-mri-test.yaml b/jjb/netconf/netconf-distribution-mri-test.yaml
@@ -7,8 +7,12 @@
     project: "netconf"
 
     stream:
-      - master:
+      - scandium:
           branch: "master"
+      - calcium:
+          branch: "7.0.x"
+      - potassium:
+          branch: "6.0.x"
 
     os-branch: "queens"
 

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
@@ -12,9 +12,15 @@
 
     # Project branches
     stream:
-      - master:
+      - scandium:
           branch: "master"
           jre: "openjdk17"
+      - calcium:
+          branch: "7.0.x"
+          jre: "openjdk17"
+      - potassium:
+          branch: "6.0.x"
+          jre: "openjdk17"
 
     karaf-version: netconf
 

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
@@ -14,9 +14,15 @@
 
     # Project branches
     stream:
-      - master:
+      - scandium:
           branch: "master"
           jre: "openjdk17"
+      - calcium:
+          branch: "7.0.x"
+          jre: "openjdk17"
+      - potassium:
+          branch: "6.0.x"
+          jre: "openjdk17"
 
     karaf-version: netconf