From 0ce7c3d5bbdc4e2208095e51883c28cd30b37870 Mon Sep 17 00:00:00 2001
From: Unknown <ana.pol@quobis.com>
Date: Thu, 13 Sep 2018 17:30:36 +0200
Subject: [PATCH] Jenkinsfile updated to v4.0

---
 Jenkinsfile | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 407a2a3d..1c150e4d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,39 +5,25 @@ pipeline {
         stage('Build Docker image') {
             steps {
                 echo 'Building docker image...'
-                sh 'docker build --no-cache -f ./Dockerfile -t registry.sonata-nfv.eu:5000/tng-portal .'
+                sh 'docker build --no-cache -f ./Dockerfile -t registry.sonata-nfv.eu:5000/tng-portal:v4.0 .'
             }
         }
         stage('Publishing') {
             steps {
                 echo 'Publishing docker image....'
-                sh 'docker push registry.sonata-nfv.eu:5000/tng-portal'
+                sh 'docker push registry.sonata-nfv.eu:5000/tng-portal:v4.0'
             }
         }
-        stage('Deploying in pre-int') {
+        stage('Deploying') {
             steps {
                 echo 'Deploying in pre-integration....'
                 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=portal"'
-                    sh 'ansible-playbook roles/vnv.yml -i environments -e "target=pre-int-vnv component=portal"'
+                    sh 'ansible-playbook roles/sp.yml -i environments -e "target=sta-sp-v4.0 component=portal"'
+                    sh 'ansible-playbook roles/vnv.yml -i environments -e "target=sta-vnv-v4.0 component=portal"'
                 }
             }      
         }
-        stage('Deployment in Integration') {
-            when {
-                branch 'master'
-            } 
-            steps {
-                sh 'docker tag registry.sonata-nfv.eu:5000/tng-portal:latest registry.sonata-nfv.eu:5000/tng-portal:int'
-                sh 'docker push registry.sonata-nfv.eu:5000/tng-portal:int'
-                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=portal"'
-                }
-            }
-        }
     }
 }