Merge "Bug 196 SO+UI container memory leak" into v2.0
diff --git a/Jenkinsfile b/Jenkinsfile
index 7caef74..717d9a0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,31 +1,30 @@
-pipeline {
- agent {
- label "pipeline"
- }
- stages {
- stage("Build") {
- agent {
- dockerfile true
- }
- steps {
- sh 'rm -rf .build'
- sh 'make NOT_DEVELOPER_BUILD=TRUE -j16 package'
- stash name: "deb-files", includes: ".build/*.deb"
- }
- }
- stage("Repo Component") {
- agent any
- steps {
- unstash "deb-files"
- sh '''
- mkdir -p pool/SO
- mv .build/*.deb pool/SO/
- mkdir -p dists/$RELEASE/SO/binary-amd64/
- apt-ftparchive packages pool/SO > dists/$RELEASE/SO/binary-amd64/Packages
- gzip -9fk dists/$RELEASE/SO/binary-amd64/Packages
- '''
- archiveArtifacts artifacts: "dists/**,pool/SO/*.deb"
- }
- }
- }
+properties([
+ parameters([
+ string(defaultValue: env.BRANCH_NAME, description: '', name: 'GERRIT_BRANCH'),
+ string(defaultValue: 'osm/SO', description: '', name: 'GERRIT_PROJECT'),
+ string(defaultValue: env.GERRIT_REFSPEC, description: '', name: 'GERRIT_REFSPEC'),
+ string(defaultValue: env.GERRIT_PATCHSET_REVISION, description: '', name: 'GERRIT_PATCHSET_REVISION'),
+ string(defaultValue: 'https://osm.etsi.org/gerrit', description: '', name: 'PROJECT_URL_PREFIX'),
+ booleanParam(defaultValue: false, description: '', name: 'TEST_INSTALL'),
+ ])
+])
+
+def devops_checkout() {
+ dir('devops') {
+ git url: "${PROJECT_URL_PREFIX}/osm/devops", branch: params.GERRIT_BRANCH
+ }
+}
+
+node {
+ checkout scm
+ devops_checkout()
+
+ ci_stage_2 = load "devops/jenkins/ci-pipelines/ci_stage_2.groovy"
+ ci_stage_2.ci_pipeline( 'SO',
+ params.PROJECT_URL_PREFIX,
+ params.GERRIT_PROJECT,
+ params.GERRIT_BRANCH,
+ params.GERRIT_REFSPEC,
+ params.GERRIT_PATCHSET_REVISION,
+ params.TEST_INSTALL)
}
diff --git a/devops-stages/stage-archive.sh b/devops-stages/stage-archive.sh
new file mode 100755
index 0000000..5c3dc5b
--- /dev/null
+++ b/devops-stages/stage-archive.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+rm -rf pool
+rm -rf dists
+mkdir -p pool/SO
+mv .build/*.deb pool/SO/
+mkdir -p dists/unstable/SO/binary-amd64/
+apt-ftparchive packages pool/SO > dists/unstable/SO/binary-amd64/Packages
+gzip -9fk dists/unstable/SO/binary-amd64/Packages
diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh
new file mode 100755
index 0000000..4354ee1
--- /dev/null
+++ b/devops-stages/stage-build.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+rm -rf .build
+make NOT_DEVELOPER_BUILD=TRUE -j16 package
+
diff --git a/devops-stages/stage-test.sh b/devops-stages/stage-test.sh
new file mode 100755
index 0000000..49296c7
--- /dev/null
+++ b/devops-stages/stage-test.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "UNITTEST"
diff --git a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_conagent.py b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_conagent.py
index 5578a35..b1e1667 100644
--- a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_conagent.py
+++ b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_conagent.py
@@ -192,7 +192,7 @@
def _on_config_agent_delete(self, config_agent):
self._log.debug("Got nsm plugin config agent delete, account: %s, type: %s",
config_agent.name, config_agent.account_type)
- cap_name = config_agent.account_type
+ cap_name = config_agent.name
if cap_name in self._plugin_instances:
self._log.debug("Config agent nsm plugin exists, deleting it.")
del self._plugin_instances[cap_name]