Merge "Final Yamllint Fixes"

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 2e11592..4ec6efb 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -1327,7 +1327,7 @@
             - 'apex-run.*'
 
     triggers:
-      - timed: '' #'0 1 * * *'
+      - timed: ''  # '0 1 * * *'
 
     builders:
       - description-setter:

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index d49b6ea..3141549 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -1195,7 +1195,7 @@
             - 'apex-run.*'
 
     triggers:
-      - timed: '' #'0 1 * * *'
+      - timed: ''  # '0 1 * * *'
 
     builders:
       - description-setter:

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index f8ed352..1aa9df6 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -36,6 +36,7 @@
     #        euphrates
     # -------------------------------
     pod:
+      # yamllint disable rule:key-duplicates
       - armband-baremetal:
           <<: *baremetal
           <<: *euphrates
@@ -51,6 +52,7 @@
       - armband-virtual:
           <<: *virtual
           <<: *master
+    # yamllint enable rule:key-duplicates
     # -------------------------------
     #       scenarios
     # -------------------------------