Merge remote-tracking branch 'v4.0/v4.0' into v4.0

tsoenen · tsoenen · commit e848950fe9b0 · 2018-09-10T10:24:04.000+02:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -96,45 +96,6 @@ pipeline {
         }
       }
     }
-    stage('Checkstyle') {
-      parallel {
-        stage('Service Lifecycle Manager') {
-          steps {
-            sh './pipeline/checkstyle/servicelifecyclemanager_stylecheck.sh || true'
-          }
-        }
-        stage('Function Lifecycle Manager') {
-          steps {
-            sh './pipeline/checkstyle/functionlifecyclemanager_stylecheck.sh || true'
-          }
-        }
-        stage('Plugin Manager') {
-          steps {
-            sh './pipeline/checkstyle/pluginmanager_stylecheck.sh || true'
-          }
-        }
-        stage('sonmanobase') {
-          steps {
-            sh './pipeline/checkstyle/sonmanobase_stylecheck.sh || true'
-          }
-        }
-        stage('Specifc Manager Registry') {
-          steps {
-            sh './pipeline/checkstyle/specificmanagerregistry_stylecheck.sh || true'
-          }
-        }
-        stage('Placement Executive') {
-          steps {
-            sh './pipeline/checkstyle/placementexecutive_stylecheck.sh || true'
-          }
-        }
-        stage('Placement Plugin') {
-          steps {
-            sh './pipeline/checkstyle/placementplugin_stylecheck.sh || true'
-          }
-        }
-      }
-    }
     stage('Publish to :latest') {
       parallel {
         stage('Service Lifecycle Manager') {
@@ -181,79 +142,64 @@ pipeline {
         }
       }
     }
-    stage('Deploying in pre-integration ') {
-      when{
-        not{
-          branch 'master'
-        }        
-      }      
-      steps {
-        sh 'rm -rf tng-devops || true'
-        sh 'git clone https://github.com/sonata-nfv/tng-devops.git'
-        dir(path: 'tng-devops') {
-          sh 'ansible-playbook roles/sp.yml -i environments -e "target=pre-int-sp component=mano-framework"'
-        }
-      }
-    }
-    stage('Publishing to :int') {
+    stage('Publishing to :v4.0') {
       when{
-        branch 'master'
+        branch 'v4.0'
       }      
       parallel {
         stage('Service Lifecycle Manager') {
           steps {
             echo 'Publishing Service Lifecycle Manager container'
-            sh './pipeline/publish/servicelifecyclemanagement.sh int'
+            sh './pipeline/publish/servicelifecyclemanagement.sh v4.0'
           }
         }
         stage('Function Lifecycle Manager') {
           steps {
             echo 'Publishing Function Lifecycle Manager container'
-            sh './pipeline/publish/functionlifecyclemanagement.sh int'
+            sh './pipeline/publish/functionlifecyclemanagement.sh v4.0'
           }
         }
         stage('Plugin Manager') {
           steps {
             echo 'Publishing Plugin Manager container'
-            sh './pipeline/publish/pluginmanager.sh int'
+            sh './pipeline/publish/pluginmanager.sh v4.0'
           }
         }
         stage('sonmanobase') {
           steps {
             echo 'Publishing sonmanobase container'
-            sh './pipeline/publish/sonmanobase.sh int'
+            sh './pipeline/publish/sonmanobase.sh v4.0'
           }
         }
         stage('Specifc Manager Registry') {
           steps {
             echo 'Publishing Specific Manager Registry container'
-            sh './pipeline/publish/specificmanagerregistry.sh int'
+            sh './pipeline/publish/specificmanagerregistry.sh v4.0'
           }
         }
         stage('Placement Executive') {
           steps {
             echo 'Publishing Placement Executive container'
-            sh './pipeline/publish/placementexecutive.sh int'
+            sh './pipeline/publish/placementexecutive.sh v4.0'
           }
         }
         stage('Placement Plugin') {
           steps {
             echo 'Publishing Placement Plugin container'
-            sh './pipeline/publish/placementplugin.sh int'
+            sh './pipeline/publish/placementplugin.sh v4.0'
           }
         }
       }
     }
-    stage('Deploying in integration') {
+    stage('Deploying in staging') {
       when{
-        branch 'master'
+        branch 'v4.0'
       }      
       steps {
-        sh './pipeline/publish/retag.sh'
         sh 'rm -rf tng-devops || true'
         sh 'git clone https://github.com/sonata-nfv/tng-devops.git'
         dir(path: 'tng-devops') {
-          sh 'ansible-playbook roles/sp.yml -i environments -e "target=int-sp component=mano-framework"'
+          sh 'ansible-playbook roles/sp.yml -i environments -e "target=sta-sp-v4.0 component=mano-framework"'
         }
       }
     }
diff --git a/pipeline/publish/functionlifecyclemanagement.sh b/pipeline/publish/functionlifecyclemanagement.sh
@@ -35,9 +35,6 @@ set -e
 
 TAG=$1
 
-if [ "$TAG" == "int" ]; then
-	echo "Retagging"
-	docker tag registry.sonata-nfv.eu:5000/functionlifecyclemanagement:latest registry.sonata-nfv.eu:5000/functionlifecyclemanagement:int
-fi
+docker tag registry.sonata-nfv.eu:5000/functionlifecyclemanagement:latest registry.sonata-nfv.eu:5000/functionlifecyclemanagement":$TAG"
 
 docker push registry.sonata-nfv.eu:5000/functionlifecyclemanagement":$TAG"
diff --git a/pipeline/publish/placementexecutive.sh b/pipeline/publish/placementexecutive.sh
@@ -35,7 +35,6 @@ set -e
 
 TAG=$1
 
-if [ "$TAG" == "int" ]; then
-	docker tag registry.sonata-nfv.eu:5000/placementexecutive:latest registry.sonata-nfv.eu:5000/placementexecutive:int
-fi
+docker tag registry.sonata-nfv.eu:5000/placementexecutive:latest registry.sonata-nfv.eu:5000/placementexecutive":$TAG"
+
 docker push registry.sonata-nfv.eu:5000/placementexecutive":$TAG"
diff --git a/pipeline/publish/placementplugin.sh b/pipeline/publish/placementplugin.sh
@@ -35,8 +35,6 @@ set -e
 
 TAG=$1
 
-if [ "$TAG" == "int" ]; then
-	docker tag registry.sonata-nfv.eu:5000/placementplugin:latest registry.sonata-nfv.eu:5000/placementplugin:int
-fi
+docker tag registry.sonata-nfv.eu:5000/placementplugin:latest registry.sonata-nfv.eu:5000/placementplugin":$TAG"
 
 docker push registry.sonata-nfv.eu:5000/placementplugin":$TAG"
diff --git a/pipeline/publish/pluginmanager.sh b/pipeline/publish/pluginmanager.sh
@@ -35,8 +35,6 @@ set -e
 
 TAG=$1
 
-if [ "$TAG" == "int" ]; then
-	docker tag registry.sonata-nfv.eu:5000/pluginmanager:latest registry.sonata-nfv.eu:5000/pluginmanager:int
-fi
+docker tag registry.sonata-nfv.eu:5000/pluginmanager:latest registry.sonata-nfv.eu:5000/pluginmanager":$TAG"
 
 docker push registry.sonata-nfv.eu:5000/pluginmanager":$TAG"
diff --git a/pipeline/publish/servicelifecyclemanagement.sh b/pipeline/publish/servicelifecyclemanagement.sh
@@ -35,8 +35,6 @@ set -e
 
 TAG=$1
 
-if [ "$TAG" == "int" ]; then
-	docker tag registry.sonata-nfv.eu:5000/servicelifecyclemanagement:latest registry.sonata-nfv.eu:5000/servicelifecyclemanagement:int
-fi
+docker tag registry.sonata-nfv.eu:5000/servicelifecyclemanagement:latest registry.sonata-nfv.eu:5000/servicelifecyclemanagement":$TAG"
 
 docker push registry.sonata-nfv.eu:5000/servicelifecyclemanagement":$TAG"
diff --git a/pipeline/publish/sonmanobase.sh b/pipeline/publish/sonmanobase.sh
@@ -35,8 +35,6 @@ set -e
 
 TAG=$1
 
-if [ "$TAG" == "int" ]; then
-	docker tag registry.sonata-nfv.eu:5000/sonmanobase:latest registry.sonata-nfv.eu:5000/sonmanobase:int
-fi
+docker tag registry.sonata-nfv.eu:5000/sonmanobase:latest registry.sonata-nfv.eu:5000/sonmanobase":$TAG"
 
 docker push registry.sonata-nfv.eu:5000/sonmanobase":$TAG"
diff --git a/pipeline/publish/specificmanagerregistry.sh b/pipeline/publish/specificmanagerregistry.sh
@@ -35,8 +35,6 @@ set -e
 
 TAG=$1
 
-if [ "$TAG" == "int" ]; then
-	docker tag registry.sonata-nfv.eu:5000/specificmanagerregistry:latest registry.sonata-nfv.eu:5000/specificmanagerregistry:int
-fi
+docker tag registry.sonata-nfv.eu:5000/specificmanagerregistry:latest registry.sonata-nfv.eu:5000/specificmanagerregistry":$TAG"
 
 docker push registry.sonata-nfv.eu:5000/specificmanagerregistry":$TAG"

Original file line number	Diff line number	Diff line change
`@@ -96,45 +96,6 @@ pipeline {`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`	`}`
`99`		`- stage('Checkstyle') {`
`100`		`- parallel {`
`101`		`- stage('Service Lifecycle Manager') {`
`102`		`- steps {`
`103`		`- sh './pipeline/checkstyle/servicelifecyclemanager_stylecheck.sh \|\| true'`
`104`		`- }`
`105`		`- }`
`106`		`- stage('Function Lifecycle Manager') {`
`107`		`- steps {`
`108`		`- sh './pipeline/checkstyle/functionlifecyclemanager_stylecheck.sh \|\| true'`
`109`		`- }`
`110`		`- }`
`111`		`- stage('Plugin Manager') {`
`112`		`- steps {`
`113`		`- sh './pipeline/checkstyle/pluginmanager_stylecheck.sh \|\| true'`
`114`		`- }`
`115`		`- }`
`116`		`- stage('sonmanobase') {`
`117`		`- steps {`
`118`		`- sh './pipeline/checkstyle/sonmanobase_stylecheck.sh \|\| true'`
`119`		`- }`
`120`		`- }`
`121`		`- stage('Specifc Manager Registry') {`
`122`		`- steps {`
`123`		`- sh './pipeline/checkstyle/specificmanagerregistry_stylecheck.sh \|\| true'`
`124`		`- }`
`125`		`- }`
`126`		`- stage('Placement Executive') {`
`127`		`- steps {`
`128`		`- sh './pipeline/checkstyle/placementexecutive_stylecheck.sh \|\| true'`
`129`		`- }`
`130`		`- }`
`131`		`- stage('Placement Plugin') {`
`132`		`- steps {`
`133`		`- sh './pipeline/checkstyle/placementplugin_stylecheck.sh \|\| true'`
`134`		`- }`
`135`		`- }`
`136`		`- }`
`137`		`- }`
`138`	`99`	`stage('Publish to :latest') {`
`139`	`100`	`parallel {`
`140`	`101`	`stage('Service Lifecycle Manager') {`
`@@ -181,79 +142,64 @@ pipeline {`
`181`	`142`	`}`
`182`	`143`	`}`
`183`	`144`	`}`
`184`		`- stage('Deploying in pre-integration ') {`
`185`		`- when{`
`186`		`- not{`
`187`		`- branch 'master'`
`188`		`- }`
`189`		`- }`
`190`		`- steps {`
`191`		`- sh 'rm -rf tng-devops \|\| true'`
`192`		`- sh 'git clone https://github.com/sonata-nfv/tng-devops.git'`
`193`		`- dir(path: 'tng-devops') {`
`194`		`- sh 'ansible-playbook roles/sp.yml -i environments -e "target=pre-int-sp component=mano-framework"'`
`195`		`- }`
`196`		`- }`
`197`		`- }`
`198`		`- stage('Publishing to :int') {`
	`145`	`+ stage('Publishing to :v4.0') {`
`199`	`146`	`when{`
`200`		`- branch 'master'`
	`147`	`+ branch 'v4.0'`
`201`	`148`	`}`
`202`	`149`	`parallel {`
`203`	`150`	`stage('Service Lifecycle Manager') {`
`204`	`151`	`steps {`
`205`	`152`	`echo 'Publishing Service Lifecycle Manager container'`
`206`		`- sh './pipeline/publish/servicelifecyclemanagement.sh int'`
	`153`	`+ sh './pipeline/publish/servicelifecyclemanagement.sh v4.0'`
`207`	`154`	`}`
`208`	`155`	`}`
`209`	`156`	`stage('Function Lifecycle Manager') {`
`210`	`157`	`steps {`
`211`	`158`	`echo 'Publishing Function Lifecycle Manager container'`
`212`		`- sh './pipeline/publish/functionlifecyclemanagement.sh int'`
	`159`	`+ sh './pipeline/publish/functionlifecyclemanagement.sh v4.0'`
`213`	`160`	`}`
`214`	`161`	`}`
`215`	`162`	`stage('Plugin Manager') {`
`216`	`163`	`steps {`
`217`	`164`	`echo 'Publishing Plugin Manager container'`
`218`		`- sh './pipeline/publish/pluginmanager.sh int'`
	`165`	`+ sh './pipeline/publish/pluginmanager.sh v4.0'`
`219`	`166`	`}`
`220`	`167`	`}`
`221`	`168`	`stage('sonmanobase') {`
`222`	`169`	`steps {`
`223`	`170`	`echo 'Publishing sonmanobase container'`
`224`		`- sh './pipeline/publish/sonmanobase.sh int'`
	`171`	`+ sh './pipeline/publish/sonmanobase.sh v4.0'`
`225`	`172`	`}`
`226`	`173`	`}`
`227`	`174`	`stage('Specifc Manager Registry') {`
`228`	`175`	`steps {`
`229`	`176`	`echo 'Publishing Specific Manager Registry container'`
`230`		`- sh './pipeline/publish/specificmanagerregistry.sh int'`
	`177`	`+ sh './pipeline/publish/specificmanagerregistry.sh v4.0'`
`231`	`178`	`}`
`232`	`179`	`}`
`233`	`180`	`stage('Placement Executive') {`
`234`	`181`	`steps {`
`235`	`182`	`echo 'Publishing Placement Executive container'`
`236`		`- sh './pipeline/publish/placementexecutive.sh int'`
	`183`	`+ sh './pipeline/publish/placementexecutive.sh v4.0'`
`237`	`184`	`}`
`238`	`185`	`}`
`239`	`186`	`stage('Placement Plugin') {`
`240`	`187`	`steps {`
`241`	`188`	`echo 'Publishing Placement Plugin container'`
`242`		`- sh './pipeline/publish/placementplugin.sh int'`
	`189`	`+ sh './pipeline/publish/placementplugin.sh v4.0'`
`243`	`190`	`}`
`244`	`191`	`}`
`245`	`192`	`}`
`246`	`193`	`}`
`247`		`- stage('Deploying in integration') {`
	`194`	`+ stage('Deploying in staging') {`
`248`	`195`	`when{`
`249`		`- branch 'master'`
	`196`	`+ branch 'v4.0'`
`250`	`197`	`}`
`251`	`198`	`steps {`
`252`		`- sh './pipeline/publish/retag.sh'`
`253`	`199`	`sh 'rm -rf tng-devops \|\| true'`
`254`	`200`	`sh 'git clone https://github.com/sonata-nfv/tng-devops.git'`
`255`	`201`	`dir(path: 'tng-devops') {`
`256`		`- sh 'ansible-playbook roles/sp.yml -i environments -e "target=int-sp component=mano-framework"'`
	`202`	`+ sh 'ansible-playbook roles/sp.yml -i environments -e "target=sta-sp-v4.0 component=mano-framework"'`
`257`	`203`	`}`
`258`	`204`	`}`
`259`	`205`	`}`