From 48cac24d88b6e762cd3e6ad9beb2b7090b8b1837 Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Tue, 10 Oct 2017 11:09:47 +0200 Subject: [PATCH] Jenkins y routes --- Jenkinsfile | 91 +++++++------------ .../mailer/application/config/app.test.json | 9 ++ .../mailer/application/config/mysql.test.json | 7 ++ .../mailer/application/config/smtp.test.json | 14 +++ .../common/methods/fake-production/route.js | 3 +- 5 files changed, 66 insertions(+), 58 deletions(-) create mode 100644 services/mailer/application/config/app.test.json create mode 100644 services/mailer/application/config/mysql.test.json create mode 100644 services/mailer/application/config/smtp.test.json diff --git a/Jenkinsfile b/Jenkinsfile index ce91d8649..59d63fb9f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,31 +1,19 @@ #!/usr/bin/env groovy -import groovy.json.*; - -def image; def branchName = "${env.BRANCH_NAME}"; -def branchNameTest = "preprod"; -def branchNameProd = "master"; -def prefixDocker = "test"; -def dockerNginxName = ["nginx", "-p 80:80 --privileged --link test-auth:auth --link test-salix:salix --link test-client:client --link test-mailer:mailer --link test-production:production"] -def dockerAuthName = ["auth", "-p 3000:3000"] -def dockerSalixName = ["salix", "-p 3001:3001"] -def dockerClientName = ["client", "-p 3002:3002"] -def dockerMailerName = ["mailer", "-p 3003:3003"] -def dockerProductionName = ["production", "-p 3004:3004"] - def buildNumber = "${env.BUILD_NUMBER}"; +def branchProduction = "master" +def branchTest = "test"; +def dockerHost = "${env.DOCKER_HOST}"; -def dockers = [dockerAuthName, dockerSalixName, dockerClientName, dockerMailerName, dockerProductionName, dockerNginxName] -node { - - if (branchName == branchNameProd) - prefixDocker = "prod"; +if (branchName == branchProduction) + dockerHost = "tcp://172.16.255.29:2375"; +node +{ stage ('Checkout') { checkout scm - } stage ('install modules'){ sh "npm install" @@ -35,47 +23,36 @@ node { sh "gulp build" } - for (int i = 0; i < dockers.size(); i++) + + stage ("docker ${element}") { - def element = dockers[i][0] - def ports = dockers[i][1] - - stage ("docker ${element}") + stage ("Stopping ${prefixDocker}-${element} actual") { - stage ("Stopping ${prefixDocker}-${element} actual") + try { - try - { - def returnDocker = sh (script: "docker stop ${prefixDocker}-${element}", returnStdout: true).trim(); - echo "${returnDocker}"; - returnDocker = sh (script: "docker rm ${prefixDocker}-${element}", returnStdout: false).trim(); - //echo "${returnDocker}"; - returnDocker = sh (script: "docker rmi ${prefixDocker}-${element}:${buildNumber-3}", returnStdout: true).trim(); - echo "borran ${prefixDocker}-${element}:${buildNumber-3}"; - //echo "${returnDocker}"; - }catch(Exception _){ - echo "Error Stage Stopping" - } - } - stage ("Create Docker Image ${element}") { - dir("./services/${element}"){ - stage ("Install modules service ${element}"){ - if (fileExists('./package.json')) - sh "npm i" - } - stage("Build image ${element}"){ - image = docker.build("${prefixDocker}-${element}:${buildNumber}", ".") - } - } - } - stage ("Run Docker ${element}"){ - image.run ("${ports} --name ${prefixDocker}-${element}") - } - /* - stage('docker registry'){ - docker.withServer('tcp://harbor.verdnatura.es','docker-registry') - } - */ + def returnDocker = sh (script: "docker stop ${prefixDocker}-${element}", returnStdout: true).trim(); + echo "${returnDocker}"; + returnDocker = sh (script: "docker rm ${prefixDocker}-${element}", returnStdout: false).trim(); + //echo "${returnDocker}"; + returnDocker = sh (script: "docker rmi ${prefixDocker}-${element}:${buildNumber-3}", returnStdout: true).trim(); + echo "borran ${prefixDocker}-${element}:${buildNumber-3}"; + //echo "${returnDocker}"; + }catch(Exception _){ + echo "Error Stage Stopping" + } } + + stage ("Generar dockers") + { + stage ("build dockers") + { + sh "docker-compose build " + } + + stage ("up dockers") + { + sh "docker-compose up -d" + } + } } } \ No newline at end of file diff --git a/services/mailer/application/config/app.test.json b/services/mailer/application/config/app.test.json new file mode 100644 index 000000000..c9ec4174b --- /dev/null +++ b/services/mailer/application/config/app.test.json @@ -0,0 +1,9 @@ +{ + "name": "MailServer", + "version": "1.0.0", + "port": 3003, + "debug": false, + "defaultLanguage": "es", + "senderMail": "noreply@localhost", + "senderName": "" +} \ No newline at end of file diff --git a/services/mailer/application/config/mysql.test.json b/services/mailer/application/config/mysql.test.json new file mode 100644 index 000000000..dee7b6929 --- /dev/null +++ b/services/mailer/application/config/mysql.test.json @@ -0,0 +1,7 @@ +{ + "host": "localhost", + "port": 3306, + "user": "rot", + "password": "", + "database": "vn" +} \ No newline at end of file diff --git a/services/mailer/application/config/smtp.test.json b/services/mailer/application/config/smtp.test.json new file mode 100644 index 000000000..8ce24c53e --- /dev/null +++ b/services/mailer/application/config/smtp.test.json @@ -0,0 +1,14 @@ +{ + "host": "smtp.verdnatura.es", + "port": 465, + "secure": true, + "auth": { + "id": 10240, + "user": "nocontestar", + "pass": "ub606cux7op" + }, + "tls": { + "rejectUnauthorized": false + }, + "pool": true +} \ No newline at end of file diff --git a/services/production/common/methods/fake-production/route.js b/services/production/common/methods/fake-production/route.js index 313c1e0d4..cd89819d5 100644 --- a/services/production/common/methods/fake-production/route.js +++ b/services/production/common/methods/fake-production/route.js @@ -12,7 +12,8 @@ module.exports = function(FakeProduction) { }); FakeProduction.routeList = function(ctx, cb) { - var query = `select routeFk from FakeProduction where routeFk is not null group by RouteFk order by routeFk`; + // var query = `select routeFk from FakeProduction where routeFk is not null group by RouteFk order by routeFk`; + let query = `call salix.production_control_source(1,1)`; var params = []; FakeProduction.rawSql(query, params, cb) .then(function(response){