Merge pull request #1 from pureport/release/7.3-pureport1

Release 7.3-pureport1

Jenkinsfile

@@ -0,0 +1,60 @@
+pipeline {
+    agent any
+    options {
+        disableConcurrentBuilds()
+    }
+    environment {
+        DOCKER_REPO = "docker.dev.pureport.com"
+        DEB_BUILDER_IMAGE = "pureport/deb-builder"
+        UID = getUid()
+        GID = getGid()
+    }
+    stages {
+        stage('Build') {
+            when {
+                branch "pureport/*"
+            }
+            steps {
+                script {
+                    def workspace = pwd()
+                    sh "git fetch --tags"
+                    sh "docker run --rm -v ${workspace}:/src -v ${workspace}:/output -e USER=${env.UID} -e GROUP=${env.GID} ${env.DOCKER_REPO}/${env.DEB_BUILDER_IMAGE} /src/build-debs.sh"
+                }
+            }
+        }
+        stage('Add to Aptly repo') {
+            when {
+                branch "pureport/stable/*"
+            }
+            steps {
+                script {
+                    echo "Add to Aptly repo..."
+                    sh "aptly repo add frr ."
+                }
+            }
+        }
+    }
+    post {
+        always {
+            /* clean up our workspace */
+            deleteDir()
+        }
+        success {
+            slackSend(color: '#30A452', message: "SUCCESS: <${env.BUILD_URL}|${env.JOB_NAME}#${env.BUILD_NUMBER}>")
+        }
+        unstable {
+            slackSend(color: '#DD9F3D', message: "UNSTABLE: <${env.BUILD_URL}|${env.JOB_NAME}#${env.BUILD_NUMBER}>")
+        }
+        failure {
+            slackSend(color: '#D41519', message: "FAILED: <${env.BUILD_URL}|${env.JOB_NAME}#${env.BUILD_NUMBER}>")
+        }
+    }
+}
+
+def getUid() {
+    sh(returnStdout: true, script: "id -u").trim()
+}
+
+def getGid() {
+    sh(returnStdout: true, script: "id -g").trim()
+}

bgpd/bgp_bmp.c

@@ -664,8 +664,7 @@ static int bmp_peer_established(struct peer *peer)
 		return 0;
 
 	/* Check if this peer just went to Established */
-	if ((peer->last_major_event != OpenConfirm) ||
-	    !(peer_established(peer)))
+	if ((peer->ostatus != OpenConfirm) || !(peer_established(peer)))
 		return 0;
 
 	if (peer->doppelganger && (peer->doppelganger->status != Deleted)) {

bgpd/bgp_snmp.c

@@ -895,7 +895,7 @@ static int bgpTrapEstablished(struct peer *peer)
 	oid index[sizeof(oid) * IN_ADDR_SIZE];
 
 	/* Check if this peer just went to Established */
-	if ((peer->last_major_event != OpenConfirm) || !(peer_established(peer)))
+	if ((peer->ostatus != OpenConfirm) || !(peer_established(peer)))
 		return 0;
 
 	ret = inet_aton(peer->host, &addr);

build-debs.sh

@@ -0,0 +1,29 @@
+#!/bin/bash -e
+
+EXTRA_VERSION="-pureport1"
+DEBIAN_FRONTEND=noninteractive
+
+# Make read-write copy of source code
+mkdir -p /build
+cp -a /src /build/source
+cd /build/source
+
+# Install build dependencies
+apt-get update
+apt-get install -y \
+   git autoconf automake libtool make libreadline-dev texinfo \
+   pkg-config libpam0g-dev libjson-c-dev bison flex python3-pytest \
+   libc-ares-dev python3-dev libsystemd-dev python-ipaddress python3-sphinx \
+   install-info build-essential libsystemd-dev libsnmp-dev perl libcap-dev \
+   chrpath gawk fakeroot debhelper devscripts libpcre3-dev wget
+wget https://ci1.netdef.org/artifact/LIBYANG-YANGRELEASE/shared/build-10/Debian-AMD64-Packages/libyang-dev_0.16.105-1_amd64.deb
+wget https://ci1.netdef.org/artifact/LIBYANG-YANGRELEASE/shared/build-10/Debian-AMD64-Packages/libyang0.16_0.16.105-1_amd64.deb
+dpkg -i libyang*.deb
+
+# Version and build packages
+./tools/tarsource.sh -V -e "${EXTRA_VERSION}"
+dpkg-buildpackage -Ppkg.frr.nortrlib
+
+# Copy packages to output dir with user's permissions
+chown -R $USER:$GROUP /build
+cp -a /build/*.deb /output/