diff --git a/data/jenkins/jenkins.yaml b/data/jenkins/jenkins.yaml index b8052e9..63e51be 100644 --- a/data/jenkins/jenkins.yaml +++ b/data/jenkins/jenkins.yaml @@ -21,12 +21,11 @@ jenkins: - id: admin password: H0l4mund0! # Agentes permanentes (WebSocket): cada SCO conecta outbound a Jenkins via wss://. - # Nombre = identificador en Jenkins. Label "sco" agrupa todos los SCOs, - # luego cliente (ralph) y tienda (yabucoa / san-lorenzo / rio-grande). + # El deploy (Jenkinsfile.sco) targetea por nombre exacto de nodo (parĂ¡metro NODO), + # no por label, por eso los nodos no llevan labelString. nodes: - permanent: name: "ralph-yabucoa-sco02" - labelString: "sco ralph yabucoa" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -35,7 +34,6 @@ jenkins: webSocket: true - permanent: name: "ralph-yabucoa-sco03" - labelString: "sco ralph yabucoa" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -44,7 +42,6 @@ jenkins: webSocket: true - permanent: name: "ralph-yabucoa-sco04" - labelString: "sco ralph yabucoa" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -53,7 +50,6 @@ jenkins: webSocket: true - permanent: name: "ralph-yabucoa-sco05" - labelString: "sco ralph yabucoa" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -62,7 +58,6 @@ jenkins: webSocket: true - permanent: name: "ralph-yabucoa-sco06" - labelString: "sco ralph yabucoa" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -71,7 +66,6 @@ jenkins: webSocket: true - permanent: name: "ralph-yabucoa-sco07" - labelString: "sco ralph yabucoa" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -80,7 +74,6 @@ jenkins: webSocket: true - permanent: name: "ralph-san-lorenzo-sco03" - labelString: "sco ralph san-lorenzo" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -89,7 +82,6 @@ jenkins: webSocket: true - permanent: name: "ralph-san-lorenzo-sco04" - labelString: "sco ralph san-lorenzo" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -98,7 +90,6 @@ jenkins: webSocket: true - permanent: name: "ralph-san-lorenzo-sco05" - labelString: "sco ralph san-lorenzo" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -107,7 +98,6 @@ jenkins: webSocket: true - permanent: name: "ralph-san-lorenzo-sco06" - labelString: "sco ralph san-lorenzo" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -116,7 +106,6 @@ jenkins: webSocket: true - permanent: name: "ralph-rio-grande-sco01" - labelString: "sco ralph rio-grande" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -125,7 +114,6 @@ jenkins: webSocket: true - permanent: name: "ralph-rio-grande-sco02" - labelString: "sco ralph rio-grande" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -134,7 +122,6 @@ jenkins: webSocket: true - permanent: name: "ralph-rio-grande-sco03" - labelString: "sco ralph rio-grande" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -143,7 +130,6 @@ jenkins: webSocket: true - permanent: name: "ralph-rio-grande-sco04" - labelString: "sco ralph rio-grande" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -152,7 +138,6 @@ jenkins: webSocket: true - permanent: name: "ralph-rio-grande-sco05" - labelString: "sco ralph rio-grande" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -161,7 +146,6 @@ jenkins: webSocket: true - permanent: name: "ralph-rio-grande-sco06" - labelString: "sco ralph rio-grande" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -170,7 +154,6 @@ jenkins: webSocket: true - permanent: name: "laboratorio-girboy-sco81" - labelString: "sco laboratorio girboy" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -179,7 +162,6 @@ jenkins: webSocket: true - permanent: name: "laboratorio-girboy-sco82" - labelString: "sco laboratorio girboy" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -188,7 +170,6 @@ jenkins: webSocket: true - permanent: name: "laboratorio-girboy-sco83" - labelString: "sco laboratorio girboy" remoteFS: "/opt/jenkins-agent" numExecutors: 1 retentionStrategy: "always" @@ -204,21 +185,11 @@ security: useScriptSecurity: false jobs: - script: | - pipelineJob('deploy-ralph') { - description('Deploy de install.sh a los SCOs de Ralph en la tienda seleccionada.') + pipelineJob('deploy-sco') { + description('Deploy de install.sh a un nodo SCO puntual, para el cliente seleccionado.') definition { cps { - script(new File('/opt/jenkins/Jenkinsfile.ralph').text) - sandbox(true) - } - } - } - - script: | - pipelineJob('deploy-lab') { - description('Deploy de install.sh a los SCOs de Deploy Lab en la tienda seleccionada.') - definition { - cps { - script(new File('/opt/jenkins/Jenkinsfile.lab').text) + script(new File('/opt/jenkins/Jenkinsfile.sco').text) sandbox(true) } } diff --git a/docker-compose.yml b/docker-compose.yml index 1d7ee55..4c7faa5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,8 +30,7 @@ services: - ./data/jenkins_home:/var/jenkins_home - ./data/jenkins/jenkins.yaml:/usr/share/jenkins/ref/jenkins.yaml:ro - ./data/jenkins/deploy:/opt/deploy:ro - - ./data/jenkins/pipelines/Jenkinsfile.ralph:/opt/jenkins/Jenkinsfile.ralph:ro - - ./data/jenkins/pipelines/Jenkinsfile.lab:/opt/jenkins/Jenkinsfile.lab:ro + - ./data/jenkins/pipelines/Jenkinsfile.sco:/opt/jenkins/Jenkinsfile.sco:ro networks: - proxy