Merge "Make the os services easier to follow"

diff --git a/jjb/autorelease/prepare-release.sh b/jjb/autorelease/prepare-release.sh
index 0a694bd4e0c035571df12fce56a709a3964dc5fd..780fd31f40a75b38a27104486ec31f1a3a45fbd6 100644 (file)
--- a/jjb/autorelease/prepare-release.sh
+++ b/jjb/autorelease/prepare-release.sh
@@ -33,7 +33,7 @@ echo autorelease "$(git rev-parse --verify HEAD)" "${RELEASE_TAG}" \
     | tee -a "$PATCH_DIR/taglist.log"
 # Disable SC2154 because we want $path to be the submodule parameter not the shell.
 # shellcheck disable=SC2154
-git submodule foreach "echo \$path $(git rev-parse --verify HEAD) ${RELEASE_TAG} \
+git submodule foreach "echo \$path \$(git rev-parse --verify HEAD) ${RELEASE_TAG} \
     | tee -a $PATCH_DIR/taglist.log"
 
 echo "$RELEASE_TAG"

diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh
index cb1bd87b391d7e7e15acff40cf5320c728ff5508..a44337e0e42713ae66411f7f559a4a5f49f0d27e 100644 (file)
--- a/jjb/autorelease/version-bump.sh
+++ b/jjb/autorelease/version-bump.sh
@@ -25,7 +25,18 @@ BRANCH="$GERRIT_BRANCH"
 set -eu -o pipefail
 
 git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
-git submodule foreach git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
+
+# TODO: Simplify once stable/nitrogen is no longer supported.
+for module in $(git submodule | awk '{ print $2 }')
+do
+    pushd "$module"
+    if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then
+        git checkout -b "v1.2.x" "origin/v1.2.x"
+    else
+        git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
+    fi
+    popd
+done
 
 # Setup Gerrit remove to ensure Change-Id gets set on commit.
 git config --global --add gitreview.username "jenkins-releng"
@@ -51,10 +62,11 @@ do
     # TODO: Remove once stable/nitrogen is no longer supported.
     if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then
         git format-patch --stdout "origin/v1.2.x" > "$patch_dir/${module//\//-}.patch"
+        git bundle create "$patch_dir/${module//\//-}.bundle" "origin/v1.2.x..HEAD"
     else
         git format-patch --stdout "origin/${BRANCH,,}" > "$patch_dir/${module//\//-}.patch"
+        git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD"
     fi
-    git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD"
     popd
 done
 

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 4d4dd1c2bfe7f8be2c7c671fd7af696717484501..1e10881fee98f29c3b64abe1aeca5876d754cba3 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -88,6 +88,22 @@
           upload-files-dir: '{upload-files-dir}'
           maven-repo-url: '{maven-repo-url}'
 
+    triggers:
+      - gerrit:
+          server-name: '{server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'build-rpm-direct'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: 'pacakges/**'
+
     publishers:
       - lf-infra-publish
 
@@ -151,6 +167,20 @@
 
     triggers:
       - timed: '@daily'
+      - gerrit:
+          server-name: '{server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'build-rpm-snap'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: 'pacakges/**'
 
     publishers:
       - lf-infra-publish
@@ -363,6 +393,21 @@
           upload-files-dir: '{upload-files-dir}'
           maven-repo-url: '{maven-repo-url}'
 
+    triggers:
+      - gerrit:
+          server-name: '{server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'build-deb'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: 'pacakges/**'
 
     publishers:
       - lf-infra-publish

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index e25c33e1ba2d578fbc71b2263cfa1baa6fad2e2e..9ba8e15bd7355fb38a8ccbff376fc997a9e67d6b 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -82,6 +82,8 @@
         templates: docker
       - platforms: ubuntu-14.04
         templates: mininet-ovs-2.5
+      - platforms: ubuntu-14.04
+        templates: mininet-ovs-2.6
       - platforms: ubuntu-16.04
         templates: java-builder
       - platforms: ubuntu-16.04