Merge "Do not specify jre or jdk if default value applies"

diff --git a/jjb/autorelease/validate-autorelease-oxygen.yaml b/jjb/autorelease/validate-autorelease-oxygen.yaml
index 1f5aea75423949dd2af73b6d97caf2d2d9b1dae1..51e30569665c534894355a94c6b9a694f5708ae0 100644 (file)
--- a/jjb/autorelease/validate-autorelease-oxygen.yaml
+++ b/jjb/autorelease/validate-autorelease-oxygen.yaml
@@ -83,5 +83,3 @@
           project: usc
       - vtn:
           project: vtn
-      - yangtools:
-          project: yangtools

diff --git a/jjb/integration/csit-jobs-oxygen.lst b/jjb/integration/csit-jobs-oxygen.lst
index 6ff15435c1aa2ac380fdcd3c18fbbd8b6178beec..18dbed402d0dfd702417fd4748883a1bf7dd0f77 100644 (file)
--- a/jjb/integration/csit-jobs-oxygen.lst
+++ b/jjb/integration/csit-jobs-oxygen.lst
@@ -4,6 +4,7 @@ aaa-csit-1node-keystone-all-oxygen,
 aaa-csit-1node-tls-only-oxygen,
 alto-csit-1node-setup-all-oxygen,
 bgpcep-csit-1node-periodic-bgp-ingest-all-oxygen,
+bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-oxygen,
 bgpcep-csit-1node-periodic-throughpcep-all-oxygen,
 bgpcep-csit-1node-userfeatures-all-oxygen,
 bgpcep-csit-3node-periodic-bgpclustering-all-oxygen,