Merge "Update validate autorelease projects for nitrogen"

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 624fb59b596e01a5a304f41b8c788e3d554a1e06..a29ac85e1940dde215eefa65653d5bad35ac2395 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -40,5 +40,11 @@
     project: releng/autorelease
     project-name: autorelease
     archive-artifacts: >
+        # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
         **/*.prop
         **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
+        **/*.hprof

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 217ea2d9bbc49bc2eba88bae2494a4ce071d7c69..83d25690b6fba07cbeef0e1d5d8eed5a43ffd37f 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -26,15 +26,9 @@
       - upstream-transparent:
           schedule: ''
           sg-mode: 'transparent'
-      - upstream-stateful:
+      - gate-transparent:
           schedule: ''
-          sg-mode: 'stateful'
-      - upstream-learn:
-          schedule: ''
-          sg-mode: 'learn'
-      - gate-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
+          sg-mode: 'transparent'
 
     stream:
       - oxygen:

diff --git a/jjb/opflex/deploy-opflex.sh b/jjb/opflex/deploy-opflex.sh
new file mode 100644 (file)
index 0000000..4d7b95a
--- /dev/null
+++ b/jjb/opflex/deploy-opflex.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2017 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+#
+# Todo: remove this script once change no 5753 is merged in global-jjb
+# This script publishes OpFlex artifacts to Nexus repository.
+#
+# $MAVEN_REPO_URL          :  Jenkins global variable should be defined.
+# $REPO_ID                 :  Provided by a job parameter.
+# $GROUP_ID                :  Provided by a job parameter.
+# $UPLOAD_FILES_PATH        :  Provided by a job parameter.
+echo "---> deploy-opflex.sh"
+
+# DO NOT enable -u because $MAVEN_PARAMS and $MAVEN_OPTIONS could be unbound.
+# Ensure we fail the job if any steps fail.
+set -e -o pipefail
+set +u
+
+export MAVEN_OPTIONS
+export MAVEN_PARAMS
+
+DEPLOY_LOG="$WORKSPACE/archives/deploy-maven-file.log"
+mkdir -p "$WORKSPACE/archives"
+
+while IFS="" read -r file
+do
+    lftools deploy maven-file "$MAVEN_REPO_URL" \
+                              "$REPO_ID" \
+                              "$file" \
+                              -b "$MVN" \
+                              -g "$GROUP_ID" \
+                              -p "$MAVEN_PARAMS $MAVEN_OPTIONS" \
+                              |& tee "$DEPLOY_LOG"
+done < <(find "$UPLOAD_FILES_PATH" -type f -name "*")

diff --git a/jjb/opflex/opflex-build.sh b/jjb/opflex/opflex-build.sh
index bacd747fbf0e41bae9963979c266214426e63c72..a35cecd8d74bfbf20b6f90539c9e34d72ce7dd81 100644 (file)
--- a/jjb/opflex/opflex-build.sh
+++ b/jjb/opflex/opflex-build.sh
@@ -23,6 +23,10 @@ export PATH="$ROOT/bin:$PATH"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ROOT/lib"
 export PKG_CONFIG_PATH="$ROOT/lib/pkgconfig"
 
+# Move OpFlex artifacts to upload files directory
+UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
+mkdir -p "$UPLOAD_FILES_PATH"
+
 # build libopflex
 pushd libopflex
 ./autogen.sh
@@ -34,6 +38,7 @@ make -j8
 if ! make check; then find . -name test-suite.log -exec cat {} \; && false; fi
 make install
 make dist
+mv *.tar.gz "$UPLOAD_FILES_PATH"
 popd
 
 # build libmodelgbp
@@ -45,6 +50,7 @@ bash autogen.sh
 make -j2
 make install
 make dist
+mv *.tar.gz "$UPLOAD_FILES_PATH"
 popd
 popd
 
@@ -58,4 +64,5 @@ pushd agent-ovs
 make -j8
 if ! make check; then find . -name test-suite.log -exec cat {} \; && false; fi
 make dist
+mv *.tar.gz "$UPLOAD_FILES_PATH"
 popd

diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
new file mode 100644 (file)
index 0000000..9d617fc
--- /dev/null
+++ b/jjb/opflex/opflex.yaml
@@ -0,0 +1,150 @@
+---
+- project:
+    name: opflex-release
+    jobs:
+      - 'opflex-release-{stream}'
+
+    stream:
+      - nitrogen:
+          branch: 'master'
+          jdk: openjdk8
+      - carbon:
+          branch: 'stable/carbon'
+          jdk: openjdk8
+      - boron:
+          branch: 'stable/boron'
+          jdk: openjdk8
+
+    project: 'opflex'
+    project-name: 'opflex'
+
+    branch: master
+    global-settings-file: global-settings
+    settings-file: opflex-settings
+    group-id: org.opendaylight.opflex
+    upload-files-dir: "$WORKSPACE/upload_files"
+
+    # Used by the release job
+    staging-profile-id: 906b0d53d714e
+
+
+- builder:
+    name: opflex-deploy-maven-file
+    # Todo: Remove this builder when the generic version of the builder is
+    # available in global-jjb. Change no: 5753
+    # Deploy artifacts to a repository.
+    #
+    # The builder requires passing the following parameters
+    # REPO_ID:           Repository ID
+    # GROUP_ID:          Group ID of the repository
+    # UPLOAD_FILES_PATH: Path to directory containing one or more files
+    builders:
+      - lf-maven-install:
+          mvn-version: '{mvn-version}'
+      - lf-provide-maven-settings:
+          global-settings-file: '{global-settings-file}'
+          settings-file: '{settings-file}'
+      - inject:
+          properties-content: |
+              MAVEN_REPO_URL=file://$WORKSPACE/m2repo
+              REPO_ID={repo-id}
+              GROUP_ID={group-id}
+              UPLOAD_FILES_PATH={upload-files-dir}
+      - shell: !include-raw-escape:
+          - ../global-jjb/shell/lftools-install.sh
+          - ../global-jjb/shell/common-variables.sh
+          - deploy-opflex.sh
+
+- builder:
+    name: opflex-maven-stage
+    # Todo: Migrate to the generic version of the builders available in
+    # global-jjb. Change no: 5753
+    # Stage files to Nexus repository.
+    #
+    # The builder requires passing the following parameters
+    # REPO_ID             : Repository ID
+    # GROUP_ID            : Group ID of the repository
+    # UPLOAD_FILES_PATH   : Path to directory containing one or more files
+    # STAGING_PROFILE_ID  : Staging profile id created on Nexus
+    builders:
+      - lf-provide-maven-settings:
+          global-settings-file: '{global-settings-file}'
+          settings-file: '{settings-file}'
+      - lf-infra-create-netrc:
+          server-id: opendaylight-staging
+      - inject:
+          properties-content: |
+              STAGING_PROFILE_ID={staging-profile-id}
+      - shell: !include-raw-escape:
+          - ../global-jjb/shell/lftools-install.sh
+          - ../global-jjb/shell/maven-stage.sh
+
+- job-template:
+    name: 'opflex-release-{stream}'
+
+    node: centos7-java-builder-2c-8g
+    jdk: '{jdk}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    build-timeout: 30
+    java-version: openjdk8
+    mvn-opts: ''
+    mvn-params: ''
+    mvn-version: mvn33
+    stream: master
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: ''
+      - lf-infra-maven-parameters:
+          mvn-opts: '{mvn-opts}'
+          mvn-params: '{mvn-params}'
+          mvn-version: '{mvn-version}'
+          staging-profile-id: '{staging-profile-id}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    builders:
+      - opflex-build:
+          mvn33: '{mvn-version}'
+          stream: '{stream}'
+      # todo: replace the builder with generic version in global-jjb
+      - opflex-deploy-maven-file:
+          global-settings-file: '{global-settings-file}'
+          settings-file: '{settings-file}'
+          mvn-version: '{mvn-version}'
+          repo-id: '{staging-profile-id}'
+          group-id: '{group-id}'
+          upload-files-dir: '{upload-files-dir}'
+      - lf-infra-create-netrc:
+          server-id: opendaylight-staging
+      # todo: replace the builder with generic version in global-jjb
+      - opflex-maven-stage:
+          global-settings-file: '{global-settings-file}'
+          settings-file: '{settings-file}'
+          staging-profile-id: '{staging-profile-id}'
+      - lf-provide-maven-settings-cleanup
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[opflex]'
+      - lf-infra-publish

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index a69f1cdb2819adec92f356b74ff0f269f9dff3b7..d07b4cb1c9aabe043a8ab2544895ad41f1eae3fd 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -321,17 +321,9 @@
         netvirt-csit-3node-openstack-ocata-upstream-stateful-oxygen,
         netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-oxygen,
         netvirt-csit-3node-openstack-ocata-upstream-transparent-oxygen,
-        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-oxygen,
-        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-oxygen,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-oxygen,
-        netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-oxygen,
-        netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-oxygen,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-oxygen,
-        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-oxygen,
-        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-oxygen,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-oxygen,
-        netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-oxygen,
-        netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-oxygen,
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-oxygen,
         nic-csit-1node-basic-all-oxygen,
         nic-csit-1node-basic-only-oxygen,
@@ -521,17 +513,9 @@
         netvirt-csit-3node-openstack-ocata-upstream-stateful-nitrogen,
         netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-3node-openstack-ocata-upstream-transparent-nitrogen,
-        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
-        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-nitrogen,
-        netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-nitrogen,
-        netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-nitrogen,
-        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
-        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-nitrogen,
-        netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-nitrogen,
-        netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-nitrogen,
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-nitrogen,
         nic-csit-1node-basic-all-nitrogen,
         nic-csit-1node-basic-only-nitrogen,
@@ -721,17 +705,9 @@
         netvirt-csit-3node-openstack-ocata-upstream-stateful-carbon,
         netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-carbon,
         netvirt-csit-3node-openstack-ocata-upstream-transparent-carbon,
-        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
-        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-carbon,
-        netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-carbon,
-        netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-carbon,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-carbon,
-        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
-        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-carbon,
-        netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-carbon,
-        netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-carbon,
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-carbon,
         nic-csit-1node-basic-all-carbon,
         nic-csit-1node-basic-only-carbon,
@@ -907,17 +883,9 @@
         netvirt-csit-3node-openstack-ocata-upstream-stateful-boron,
         netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-boron,
         netvirt-csit-3node-openstack-ocata-upstream-transparent-boron,
-        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-boron,
-        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-boron,
-        netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-boron,
-        netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-boron,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-boron,
-        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-boron,
-        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-boron,
-        netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-boron,
-        netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-boron,
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-boron,
         netvirt-legacy-csit-1node-openstack-basic-all-boron,
         netvirt-legacy-csit-1node-openstack-basic-only-boron,