From baa596430e757ebe57251794b37aa7778c7f250c Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 4 Jul 2024 11:08:26 +0200 Subject: [PATCH 01/68] fix: refs #7643 Reprepro stage --- Jenkinsfile | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8a8d284c..521c9feb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,6 +4,7 @@ def BRANCH_ENV = [ test: 'test', master: 'production' ] +def remote = [:] node { stage('Setup') { @@ -35,8 +36,33 @@ pipeline { } } steps { - sh 'debuild -us -uc -b' - sh 'vn-includedeb bookworm' + sh 'debuild -us -uc -b --buildinfo-option="-o output" --changes-option="-o output"' + } + } + stage('Reprepro') { + when { + anyOf { + branch 'master' + branch 'test' + } + } + steps { + script { + remote.name = 'reprerpo' + remote.host = 'reprepro.reprepro' + remote.user = 'root' + remote.identityFile = '/home/jenkins/.ssh/id_ed25519' + remote.allowAnyHosts = true + } + sshPut([ + remote: remote, + from: "$debFile", + into: '/tmp' + ]) + sshcommand([ + remote: remote, + command: "sudo -u www-data reprepro -b /reprepro --gnupghome /reprepro/.gnupg includedeb bookworm /tmp/$debFile" + ]) } } stage('Container') { -- 2.40.1 From a868a5b5404f2949fa20a37ba18c84a67ff9a7ad Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 4 Jul 2024 11:15:53 +0200 Subject: [PATCH 02/68] fix: refs #7643 Reprepro stage debug --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 521c9feb..40fe43f9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,6 +36,7 @@ pipeline { } } steps { + sh 'sleep 86300' sh 'debuild -us -uc -b --buildinfo-option="-o output" --changes-option="-o output"' } } -- 2.40.1 From 1f1043a43cf0efcdc8efee80c1d6c4a63f9d5f74 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 4 Jul 2024 11:24:45 +0200 Subject: [PATCH 03/68] fix: refs #7643 Reprepro stage debug --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 40fe43f9..486288e1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,8 +36,7 @@ pipeline { } } steps { - sh 'sleep 86300' - sh 'debuild -us -uc -b --buildinfo-option="-o output" --changes-option="-o output"' + sh 'debuild -us -uc -b' } } stage('Reprepro') { -- 2.40.1 From ff63cd11c31606ded87cd52f2859b9afa748a903 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 4 Jul 2024 11:28:29 +0200 Subject: [PATCH 04/68] fix: refs #7643 Reprepro stage debug --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 486288e1..562d422e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,6 @@ pipeline { image 'registry.verdnatura.es/debuild:2.23.4-vn1' registryUrl 'https://registry.verdnatura.es/' registryCredentialsId 'docker-registry' - args '-v /mnt/appdata/reprepro:/reprepro' } } steps { -- 2.40.1 From 921b029b069d134a107b588e75328156f6ca3386 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 4 Jul 2024 11:51:48 +0200 Subject: [PATCH 05/68] fix: refs #7643 Update debuild image --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 562d422e..7bfca3fa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { } agent { docker { - image 'registry.verdnatura.es/debuild:2.23.4-vn1' + image 'registry.verdnatura.es/debuild:2.23.4-vn2' registryUrl 'https://registry.verdnatura.es/' registryCredentialsId 'docker-registry' } @@ -77,7 +77,7 @@ pipeline { steps { script { def packageJson = readJSON file: 'package.json' - env.VERSION = packageJson.version + env.VERSION = "${packageJson.version}-build${env.BUILD_ID}" } sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY' sh 'docker-compose build --build-arg BUILD_ID=$BUILD_ID --parallel' @@ -94,7 +94,7 @@ pipeline { steps { script { def packageJson = readJSON file: 'package.json' - env.VERSION = packageJson.version + env.VERSION = "${packageJson.version}-build${env.BUILD_ID}" } withKubeConfig([ serverUrl: "$KUBERNETES_API", -- 2.40.1 From d1c4f9dba23db8b4fbd3865924567f8f1e170630 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 4 Jul 2024 16:21:11 +0200 Subject: [PATCH 06/68] fix: refs #7643 Debuild stage debug --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 7bfca3fa..9af5abeb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,6 +35,7 @@ pipeline { } } steps { + sh 'sleep 86400' sh 'debuild -us -uc -b' } } -- 2.40.1 From ca4457bf5430715f3254666d7e8c18e2987e10ba Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 4 Jul 2024 16:28:42 +0200 Subject: [PATCH 07/68] ci: refs #7643 Debuild output --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9af5abeb..fbe538ae 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,8 +35,7 @@ pipeline { } } steps { - sh 'sleep 86400' - sh 'debuild -us -uc -b' + sh 'debuild -us -uc -b --buildinfo-option="-o output" --changes-option="-o output"' } } stage('Reprepro') { -- 2.40.1 From c4977b7997affd7dedc9894077febb59d4d73d5b Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 4 Jul 2024 18:10:31 +0200 Subject: [PATCH 08/68] fix: refs #7643 Debuild stage debug --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index fbe538ae..3b7f744c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,6 +35,7 @@ pipeline { } } steps { + sh 'sleep 86400' sh 'debuild -us -uc -b --buildinfo-option="-o output" --changes-option="-o output"' } } -- 2.40.1 From 7a94c3a01e0cd6a1cd26f349ae4672d415eda92c Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 4 Jul 2024 18:42:34 +0200 Subject: [PATCH 09/68] ci: refs #7643 Debuild image fixes --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3b7f744c..e3e46676 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,14 +29,14 @@ pipeline { } agent { docker { - image 'registry.verdnatura.es/debuild:2.23.4-vn2' + image 'registry.verdnatura.es/debuild:2.23.4-vn4' registryUrl 'https://registry.verdnatura.es/' registryCredentialsId 'docker-registry' + args '-u root' } } steps { - sh 'sleep 86400' - sh 'debuild -us -uc -b --buildinfo-option="-o output" --changes-option="-o output"' + sh 'debuild -us -uc -b' } } stage('Reprepro') { -- 2.40.1 From 749189d726b3dc7f1b79a2e94ece8c4bea6a8798 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 4 Jul 2024 18:45:32 +0200 Subject: [PATCH 10/68] fix: refs #7643 Debuild stage debug --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index e3e46676..ca4dbdfe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,6 +37,7 @@ pipeline { } steps { sh 'debuild -us -uc -b' + sh 'sleep 86400' } } stage('Reprepro') { -- 2.40.1 From 17baf12449728d026575fd355605f1cbe6c97bfc Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 4 Jul 2024 18:48:49 +0200 Subject: [PATCH 11/68] fix: refs #7643 Debuild stage debug --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ca4dbdfe..f29c2d10 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ pipeline { } } steps { - sh 'debuild -us -uc -b' + sh 'debuild -us -uc -b --buildinfo-option="-o output" --changes-option="-o output"' sh 'sleep 86400' } } -- 2.40.1 From 9507292a1325651b4e107307d22af254e11a8388 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 4 Jul 2024 19:00:35 +0200 Subject: [PATCH 12/68] fix: refs #7643 Debuild stage debug --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f29c2d10..8f878bc7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,10 @@ pipeline { } } steps { - sh 'debuild -us -uc -b --buildinfo-option="-o output" --changes-option="-o output"' + sh 'debuild -us -uc -b' + sh 'mkdir -p output' + sh 'rm output/*' + sh 'cp ../*.deb output' sh 'sleep 86400' } } -- 2.40.1 From cc5faf97da2f4069cdab4f712bef5a443c50f03d Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 4 Jul 2024 19:04:04 +0200 Subject: [PATCH 13/68] ci: refs #7643 Debuild image fixes --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8f878bc7..960e15ea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,7 +38,6 @@ pipeline { steps { sh 'debuild -us -uc -b' sh 'mkdir -p output' - sh 'rm output/*' sh 'cp ../*.deb output' sh 'sleep 86400' } -- 2.40.1 From 0952a690a56cd6953716da72045c508eca5be1cd Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 4 Jul 2024 19:19:30 +0200 Subject: [PATCH 14/68] ci: refs #7643 Debuild image fixes --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 960e15ea..85b92d87 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,13 +32,12 @@ pipeline { image 'registry.verdnatura.es/debuild:2.23.4-vn4' registryUrl 'https://registry.verdnatura.es/' registryCredentialsId 'docker-registry' - args '-u root' } } steps { sh 'debuild -us -uc -b' sh 'mkdir -p output' - sh 'cp ../*.deb output' + sh 'mv ../*.deb ../*.build ../*.buildinfo ../*.changes output' sh 'sleep 86400' } } -- 2.40.1 From 5abcf9e71dcbdaed7e4fffa9180f78b007518e94 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 09:48:29 +0200 Subject: [PATCH 15/68] ci: refs #7643 Debuild image fixes --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 85b92d87..03088d2b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { } agent { docker { - image 'registry.verdnatura.es/debuild:2.23.4-vn4' + image 'registry.verdnatura.es/debuild:2.23.4-vn5' registryUrl 'https://registry.verdnatura.es/' registryCredentialsId 'docker-registry' } @@ -50,7 +50,7 @@ pipeline { } steps { script { - remote.name = 'reprerpo' + remote.name = 'reprepro' remote.host = 'reprepro.reprepro' remote.user = 'root' remote.identityFile = '/home/jenkins/.ssh/id_ed25519' -- 2.40.1 From cb61ad5d119c357fbd0f4eb74352af0da9ccf2f5 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 10:04:10 +0200 Subject: [PATCH 16/68] ci: refs #7643 Debuild artifact --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 03088d2b..80ec6b04 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,7 +38,8 @@ pipeline { sh 'debuild -us -uc -b' sh 'mkdir -p output' sh 'mv ../*.deb ../*.build ../*.buildinfo ../*.changes output' - sh 'sleep 86400' + + stash includes: 'output/*.deb', name: 'packages' } } stage('Reprepro') { -- 2.40.1 From 0d2ac8f9fb72625eecb8c536dc1e14ea87166d4b Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 10:07:37 +0200 Subject: [PATCH 17/68] ci: refs #7643 Debuild debug --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 80ec6b04..dac8052b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,6 +57,7 @@ pipeline { remote.identityFile = '/home/jenkins/.ssh/id_ed25519' remote.allowAnyHosts = true } + sh 'ls output' sshPut([ remote: remote, from: "$debFile", -- 2.40.1 From bf5ba5dac1e814fd854aca6b7fbe502fece8d0f8 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 10:20:07 +0200 Subject: [PATCH 18/68] ci: refs #7643 Debuild debug --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index dac8052b..c46f875c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,7 +39,7 @@ pipeline { sh 'mkdir -p output' sh 'mv ../*.deb ../*.build ../*.buildinfo ../*.changes output' - stash includes: 'output/*.deb', name: 'packages' + stash includes: 'output/*.deb', name: 'debPackage' } } stage('Reprepro') { @@ -57,7 +57,10 @@ pipeline { remote.identityFile = '/home/jenkins/.ssh/id_ed25519' remote.allowAnyHosts = true } + + unstash 'debPackage' sh 'ls output' + sshPut([ remote: remote, from: "$debFile", -- 2.40.1 From 6be7bccff7090389bfc6d2a58ae30304a86941ba Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 10:29:35 +0200 Subject: [PATCH 19/68] ci: refs #7643 Debuild debug --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c46f875c..818050f7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,16 +50,17 @@ pipeline { } } steps { + unstash 'debPackage' + script { remote.name = 'reprepro' remote.host = 'reprepro.reprepro' remote.user = 'root' remote.identityFile = '/home/jenkins/.ssh/id_ed25519' remote.allowAnyHosts = true - } - unstash 'debPackage' - sh 'ls output' + def debFile = sh(script: 'ls target/*.jar', returnStdout: true).trim() + } sshPut([ remote: remote, -- 2.40.1 From 5bc20e9e05b17a0afe150c260e2a7db2119a33ca Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 10:32:08 +0200 Subject: [PATCH 20/68] ci: refs #7643 Reprepro fixes --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 818050f7..80c212ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,7 +59,7 @@ pipeline { remote.identityFile = '/home/jenkins/.ssh/id_ed25519' remote.allowAnyHosts = true - def debFile = sh(script: 'ls target/*.jar', returnStdout: true).trim() + def debFile = sh(script: 'ls output/*.deb', returnStdout: true).trim() } sshPut([ -- 2.40.1 From d6e7d3b02543cf9a2bd47a957fdd1829d8f4ad64 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 10:34:27 +0200 Subject: [PATCH 21/68] ci: refs #7643 Reprepro fixes --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 80c212ed..4c723a1f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,6 +5,7 @@ def BRANCH_ENV = [ master: 'production' ] def remote = [:] +def debFile node { stage('Setup') { @@ -59,7 +60,7 @@ pipeline { remote.identityFile = '/home/jenkins/.ssh/id_ed25519' remote.allowAnyHosts = true - def debFile = sh(script: 'ls output/*.deb', returnStdout: true).trim() + debFile = sh(script: 'ls output/*.deb', returnStdout: true).trim() } sshPut([ -- 2.40.1 From 7174842cfadec4f2a3be9fcfbad2f5fc2fd9d14b Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 11:08:44 +0200 Subject: [PATCH 22/68] ci: refs #7643 Reprepro SSH credentials --- Jenkinsfile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4c723a1f..07bc6031 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,7 +40,7 @@ pipeline { sh 'mkdir -p output' sh 'mv ../*.deb ../*.build ../*.buildinfo ../*.changes output' - stash includes: 'output/*.deb', name: 'debPackage' + stash includes: 'output', name: 'debuildOutput' } } stage('Reprepro') { @@ -51,16 +51,19 @@ pipeline { } } steps { - unstash 'debPackage' + unstash 'debuildOutput' + debFile = sh(script: 'ls output/*.deb', returnStdout: true).trim() - script { + withCredentials([sshUserPrivateKey( + credentialsId: 'jenkins-agent', + usernameVariable: 'user' + keyFileVariable: 'identityFile' + )]) { remote.name = 'reprepro' remote.host = 'reprepro.reprepro' - remote.user = 'root' - remote.identityFile = '/home/jenkins/.ssh/id_ed25519' remote.allowAnyHosts = true - - debFile = sh(script: 'ls output/*.deb', returnStdout: true).trim() + remote.user = user + remote.identityFile = identityFile } sshPut([ -- 2.40.1 From 756fccaa78f59c864e0c4e39efd781bcb376601f Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 11:09:15 +0200 Subject: [PATCH 23/68] ci: refs #7643 Reprepro SSH credentials fix --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 07bc6031..e0e7a800 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,7 +56,7 @@ pipeline { withCredentials([sshUserPrivateKey( credentialsId: 'jenkins-agent', - usernameVariable: 'user' + usernameVariable: 'user', keyFileVariable: 'identityFile' )]) { remote.name = 'reprepro' -- 2.40.1 From 59e79993853259b198dfaddcfc514c86fe8a6434 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 11:10:10 +0200 Subject: [PATCH 24/68] ci: refs #7643 Reprepro SSH credentials fix --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e0e7a800..b79a0eaa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,7 +52,9 @@ pipeline { } steps { unstash 'debuildOutput' - debFile = sh(script: 'ls output/*.deb', returnStdout: true).trim() + script { + debFile = sh(script: 'ls output/*.deb', returnStdout: true).trim() + } withCredentials([sshUserPrivateKey( credentialsId: 'jenkins-agent', -- 2.40.1 From c6589989d461e3f10ec17b94238c0dcd70c3433f Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 11:11:29 +0200 Subject: [PATCH 25/68] ci: refs #7643 Reprepro SSH credentials fix --- Jenkinsfile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b79a0eaa..175df796 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,20 +52,22 @@ pipeline { } steps { unstash 'debuildOutput' + script { debFile = sh(script: 'ls output/*.deb', returnStdout: true).trim() - } - withCredentials([sshUserPrivateKey( - credentialsId: 'jenkins-agent', - usernameVariable: 'user', - keyFileVariable: 'identityFile' - )]) { remote.name = 'reprepro' remote.host = 'reprepro.reprepro' remote.allowAnyHosts = true - remote.user = user - remote.identityFile = identityFile + + withCredentials([sshUserPrivateKey( + credentialsId: 'jenkins-agent', + usernameVariable: 'user', + keyFileVariable: 'identityFile' + )]) { + remote.user = user + remote.identityFile = identityFile + } } sshPut([ -- 2.40.1 From dcf46094f0083c21e0968e51a152e07481e89c36 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 11:13:03 +0200 Subject: [PATCH 26/68] ci: refs #7643 Reprepro SSH credentials fix --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 175df796..ca9f473c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,7 +40,7 @@ pipeline { sh 'mkdir -p output' sh 'mv ../*.deb ../*.build ../*.buildinfo ../*.changes output' - stash includes: 'output', name: 'debuildOutput' + stash includes: 'output/*', name: 'debuildOutput' } } stage('Reprepro') { -- 2.40.1 From 5cf6ef5b1c5e62f84ff0294f5222eebe8ac4198d Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 13:01:49 +0200 Subject: [PATCH 27/68] ci: refs #7643 Reprepro SSH credentials fix --- Jenkinsfile | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ca9f473c..e6d7215f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,33 +52,31 @@ pipeline { } steps { unstash 'debuildOutput' - script { debFile = sh(script: 'ls output/*.deb', returnStdout: true).trim() + } + withCredentials([sshUserPrivateKey( + credentialsId: 'jenkins-agent', + usernameVariable: 'user', + keyFileVariable: 'identityFile' + )]) { + remote.user = user + remote.identityFile = identityFile remote.name = 'reprepro' remote.host = 'reprepro.reprepro' remote.allowAnyHosts = true - withCredentials([sshUserPrivateKey( - credentialsId: 'jenkins-agent', - usernameVariable: 'user', - keyFileVariable: 'identityFile' - )]) { - remote.user = user - remote.identityFile = identityFile - } + sshPut([ + remote: remote, + from: "$debFile", + into: '/tmp' + ]) + sshcommand([ + remote: remote, + command: "sudo -u www-data reprepro -b /reprepro --gnupghome /reprepro/.gnupg includedeb bookworm /tmp/$debFile" + ]) } - - sshPut([ - remote: remote, - from: "$debFile", - into: '/tmp' - ]) - sshcommand([ - remote: remote, - command: "sudo -u www-data reprepro -b /reprepro --gnupghome /reprepro/.gnupg includedeb bookworm /tmp/$debFile" - ]) } } stage('Container') { -- 2.40.1 From ab88575c724f40b192f965f55ddb12b98e654516 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 13:02:48 +0200 Subject: [PATCH 28/68] ci: refs #7643 Reprepro SSH credentials fix --- Jenkinsfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e6d7215f..f69d1031 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -61,12 +61,13 @@ pipeline { usernameVariable: 'user', keyFileVariable: 'identityFile' )]) { - remote.user = user - remote.identityFile = identityFile - remote.name = 'reprepro' - remote.host = 'reprepro.reprepro' - remote.allowAnyHosts = true - + script { + remote.user = user + remote.identityFile = identityFile + remote.name = 'reprepro' + remote.host = 'reprepro.reprepro' + remote.allowAnyHosts = true + } sshPut([ remote: remote, from: "$debFile", -- 2.40.1 From 444732460e4ea157d6dfce209da93bbaeb0d7612 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 13:05:06 +0200 Subject: [PATCH 29/68] ci: refs #7643 Reprepro SSH credentials fix --- Jenkinsfile | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f69d1031..a321d0a0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,27 +56,28 @@ pipeline { debFile = sh(script: 'ls output/*.deb', returnStdout: true).trim() } - withCredentials([sshUserPrivateKey( - credentialsId: 'jenkins-agent', - usernameVariable: 'user', - keyFileVariable: 'identityFile' - )]) { - script { + script { + withCredentials([sshUserPrivateKey( + credentialsId: 'jenkins-agent', + usernameVariable: 'user', + keyFileVariable: 'identityFile' + )]) { remote.user = user remote.identityFile = identityFile remote.name = 'reprepro' remote.host = 'reprepro.reprepro' remote.allowAnyHosts = true + + sshPut([ + remote: remote, + from: "$debFile", + into: '/tmp' + ]) + sshcommand([ + remote: remote, + command: "sudo -u www-data reprepro -b /reprepro --gnupghome /reprepro/.gnupg includedeb bookworm /tmp/$debFile" + ]) } - sshPut([ - remote: remote, - from: "$debFile", - into: '/tmp' - ]) - sshcommand([ - remote: remote, - command: "sudo -u www-data reprepro -b /reprepro --gnupghome /reprepro/.gnupg includedeb bookworm /tmp/$debFile" - ]) } } } -- 2.40.1 From b73e292cb0c28c47bb7689951af4202e57ffbd58 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 13:07:53 +0200 Subject: [PATCH 30/68] ci: refs #7643 Reprepro SSH credentials debug --- Jenkinsfile | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a321d0a0..fefc5c78 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,28 +56,28 @@ pipeline { debFile = sh(script: 'ls output/*.deb', returnStdout: true).trim() } - script { - withCredentials([sshUserPrivateKey( - credentialsId: 'jenkins-agent', - usernameVariable: 'user', - keyFileVariable: 'identityFile' - )]) { + withCredentials([sshUserPrivateKey( + credentialsId: 'jenkins-agent', + usernameVariable: 'user', + keyFileVariable: 'identityFile' + )]) { + script { remote.user = user remote.identityFile = identityFile remote.name = 'reprepro' remote.host = 'reprepro.reprepro' remote.allowAnyHosts = true - - sshPut([ - remote: remote, - from: "$debFile", - into: '/tmp' - ]) - sshcommand([ - remote: remote, - command: "sudo -u www-data reprepro -b /reprepro --gnupghome /reprepro/.gnupg includedeb bookworm /tmp/$debFile" - ]) } + sleep 600 // DEBUG + sshPut([ + remote: remote, + from: "$debFile", + into: '/tmp' + ]) + sshcommand([ + remote: remote, + command: "sudo -u www-data reprepro -b /reprepro --gnupghome /reprepro/.gnupg includedeb bookworm /tmp/$debFile" + ]) } } } -- 2.40.1 From 90137ab08f867982da9448fd97d7326e2d161ea5 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 13:18:18 +0200 Subject: [PATCH 31/68] ci: refs #7643 Reprepro SSH credentials debug --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index fefc5c78..74ada63c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,7 @@ pipeline { } agent { docker { - image 'registry.verdnatura.es/debuild:2.23.4-vn5' + image 'registry.verdnatura.es/debuild:2.23.4-vn6' registryUrl 'https://registry.verdnatura.es/' registryCredentialsId 'docker-registry' } -- 2.40.1 From 1efb84dd83c80d6d57bb066897217b802acca6e2 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 13:20:40 +0200 Subject: [PATCH 32/68] ci: refs #7643 Reprepro SSH credentials debug --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 74ada63c..20bf0df8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,6 +68,7 @@ pipeline { remote.host = 'reprepro.reprepro' remote.allowAnyHosts = true } + echo "$user $identityFile" sleep 600 // DEBUG sshPut([ remote: remote, -- 2.40.1 From 7618e6510538662ac46149ef889f2ba40765381c Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 13:32:42 +0200 Subject: [PATCH 33/68] ci: refs #7643 Reprepro SSH credentials debug --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 20bf0df8..d1639ebe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,9 +67,9 @@ pipeline { remote.name = 'reprepro' remote.host = 'reprepro.reprepro' remote.allowAnyHosts = true + remote.logLevel = 'FINEST' } echo "$user $identityFile" - sleep 600 // DEBUG sshPut([ remote: remote, from: "$debFile", -- 2.40.1 From 44a45a25b2125abfca342f22ee93aaad6fc3b767 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 13:36:39 +0200 Subject: [PATCH 34/68] ci: refs #7643 Reprepro SSH credentials debug --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d1639ebe..72be7091 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -63,7 +63,8 @@ pipeline { )]) { script { remote.user = user - remote.identityFile = identityFile + //remote.identityFile = identityFile + remote.identityFile = 'id_ed25519' remote.name = 'reprepro' remote.host = 'reprepro.reprepro' remote.allowAnyHosts = true -- 2.40.1 From 14451121ac79f21777a57d10c5237fbf872e69fe Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 13:41:43 +0200 Subject: [PATCH 35/68] ci: refs #7643 Reprepro SSH credentials debug --- Jenkinsfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 72be7091..5b7f26b2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,18 +59,17 @@ pipeline { withCredentials([sshUserPrivateKey( credentialsId: 'jenkins-agent', usernameVariable: 'user', - keyFileVariable: 'identityFile' + keyFileVariable: 'keyFile' )]) { script { remote.user = user - //remote.identityFile = identityFile - remote.identityFile = 'id_ed25519' + remote.identity = keyFile remote.name = 'reprepro' remote.host = 'reprepro.reprepro' remote.allowAnyHosts = true remote.logLevel = 'FINEST' } - echo "$user $identityFile" + echo "$user $keyFile" sshPut([ remote: remote, from: "$debFile", -- 2.40.1 From 36573342b72c111a0f0bd1a8eebe62e559130bac Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 13:43:41 +0200 Subject: [PATCH 36/68] ci: refs #7643 Reprepro SSH credentials debug --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5b7f26b2..7e342148 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -63,7 +63,7 @@ pipeline { )]) { script { remote.user = user - remote.identity = keyFile + remote.identityFile = keyFile remote.name = 'reprepro' remote.host = 'reprepro.reprepro' remote.allowAnyHosts = true -- 2.40.1 From 96fd08b3699bae2e89ed5ce8e9cf4feb4c8881cf Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 13:55:23 +0200 Subject: [PATCH 37/68] ci: refs #7643 Reprepro SSH credentials fix --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7e342148..1ca62ade 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,13 +69,12 @@ pipeline { remote.allowAnyHosts = true remote.logLevel = 'FINEST' } - echo "$user $keyFile" sshPut([ remote: remote, from: "$debFile", into: '/tmp' ]) - sshcommand([ + sshCommand([ remote: remote, command: "sudo -u www-data reprepro -b /reprepro --gnupghome /reprepro/.gnupg includedeb bookworm /tmp/$debFile" ]) -- 2.40.1 From 03be5f9a564446a26ff7a1d70fdeeb81eec4042f Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 14:11:04 +0200 Subject: [PATCH 38/68] ci: refs #7643 Reprepro SSH credentials fix --- Jenkinsfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1ca62ade..98b79e22 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,7 +53,8 @@ pipeline { steps { unstash 'debuildOutput' script { - debFile = sh(script: 'ls output/*.deb', returnStdout: true).trim() + def debPath = sh(script: 'ls output/*.deb', returnStdout: true).trim() + debFile = new File(debPath).getName() } withCredentials([sshUserPrivateKey( @@ -71,12 +72,12 @@ pipeline { } sshPut([ remote: remote, - from: "$debFile", - into: '/tmp' + from: 'output/*', + into: '/var/www/html/incoming' ]) sshCommand([ remote: remote, - command: "sudo -u www-data reprepro -b /reprepro --gnupghome /reprepro/.gnupg includedeb bookworm /tmp/$debFile" + command: "sudo -u www-data reprepro -b /reprepro --gnupghome /reprepro/.gnupg includedeb bookworm /var/www/html/incoming/$debFile" ]) } } -- 2.40.1 From d66047c451a61364d20b53fd432a1b3e21dd18e0 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 14:20:41 +0200 Subject: [PATCH 39/68] ci: refs #7643 Reprepro & debuild fixes --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 98b79e22..ab5233e8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,9 +53,10 @@ pipeline { steps { unstash 'debuildOutput' script { - def debPath = sh(script: 'ls output/*.deb', returnStdout: true).trim() - debFile = new File(debPath).getName() + def files = findFiles(glob: 'output/*.deb') + files.each { file -> debFile = file.name } } + echo debFile withCredentials([sshUserPrivateKey( credentialsId: 'jenkins-agent', -- 2.40.1 From b62185289ff2f628b3b5e78a603752b87a21ccfd Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 5 Jul 2024 14:22:15 +0200 Subject: [PATCH 40/68] ci: refs #7643 Reprepro & debuild fixes --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ab5233e8..b1c5278e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -73,7 +73,7 @@ pipeline { } sshPut([ remote: remote, - from: 'output/*', + from: "output/$debFile", into: '/var/www/html/incoming' ]) sshCommand([ -- 2.40.1 From 29168a6927b1bd632f065a7bacd75998fb583f20 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 9 Jul 2024 10:38:42 +0200 Subject: [PATCH 41/68] ci: refs #7643 Reprepro & debuild fixes --- Jenkinsfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b1c5278e..bc2849e1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,7 +56,6 @@ pipeline { def files = findFiles(glob: 'output/*.deb') files.each { file -> debFile = file.name } } - echo debFile withCredentials([sshUserPrivateKey( credentialsId: 'jenkins-agent', @@ -69,16 +68,15 @@ pipeline { remote.name = 'reprepro' remote.host = 'reprepro.reprepro' remote.allowAnyHosts = true - remote.logLevel = 'FINEST' } sshPut([ remote: remote, from: "output/$debFile", - into: '/var/www/html/incoming' + into: '/var/lib/reprepro/repo/incoming' ]) sshCommand([ remote: remote, - command: "sudo -u www-data reprepro -b /reprepro --gnupghome /reprepro/.gnupg includedeb bookworm /var/www/html/incoming/$debFile" + command: "reprepro -b /reprepro --gnupghome /reprepro/.gnupg includedeb bookworm /var/lib/reprepro/repo/incoming/$debFile" ]) } } -- 2.40.1 From 979b1293a94267edda9b0b76c14110bae04883be Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 9 Jul 2024 10:45:22 +0200 Subject: [PATCH 42/68] ci: refs #7643 Reprepro includedeb fix --- Jenkinsfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bc2849e1..c682025a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,6 +50,10 @@ pipeline { branch 'test' } } + environment { + REPREPRO_DIR = '/var/lib/reprepro' + REPO_DIR = "$REPREPRO_DIR/repo" + } steps { unstash 'debuildOutput' script { @@ -72,11 +76,11 @@ pipeline { sshPut([ remote: remote, from: "output/$debFile", - into: '/var/lib/reprepro/repo/incoming' + into: "$REPO_DIR/incoming" ]) sshCommand([ remote: remote, - command: "reprepro -b /reprepro --gnupghome /reprepro/.gnupg includedeb bookworm /var/lib/reprepro/repo/incoming/$debFile" + command: "reprepro -b $REPO_DIR --gnupghome $REPREPRO_DIR/.gnupg includedeb bookworm $REPO_DIR/incoming/$debFile" ]) } } -- 2.40.1 From 0d61a9de038e549fed639b49402e62a80d329976 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 9 Jul 2024 11:38:58 +0200 Subject: [PATCH 43/68] ci: refs #7643 Reprepro includedeb improve --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index c682025a..164648c4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,6 +39,7 @@ pipeline { sh 'debuild -us -uc -b' sh 'mkdir -p output' sh 'mv ../*.deb ../*.build ../*.buildinfo ../*.changes output' + sleep 600 stash includes: 'output/*', name: 'debuildOutput' } -- 2.40.1 From 7ff9e2e97d5b8b5f0a4bec170812da377e4ca04c Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 9 Jul 2024 12:04:23 +0200 Subject: [PATCH 44/68] ci: refs #7643 Reprepro includedeb improve --- Jenkinsfile | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 164648c4..a74e7fdc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -86,7 +86,7 @@ pipeline { } } } - stage('Container') { + stage('Deploy') { when { anyOf { branch 'master' @@ -99,32 +99,21 @@ pipeline { steps { script { def packageJson = readJSON file: 'package.json' - env.VERSION = "${packageJson.version}-build${env.BUILD_ID}" + env.VERSION = "${packageJson.version}" + env.TAG = "${packageJson.version}-build${env.BUILD_ID}" } + sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY' sh 'docker-compose build --build-arg BUILD_ID=$BUILD_ID --parallel' sh 'docker-compose push' - } - } - stage('Deploy') { - when { - anyOf { - branch 'master' - branch 'test' - } - } - steps { - script { - def packageJson = readJSON file: 'package.json' - env.VERSION = "${packageJson.version}-build${env.BUILD_ID}" - } + withKubeConfig([ serverUrl: "$KUBERNETES_API", credentialsId: 'kubernetes', namespace: 'salix' ]) { - sh 'kubectl set image deployment/hedera-web-$BRANCH_NAME hedera-web-$BRANCH_NAME=$REGISTRY/hedera-web:$VERSION' - sh 'kubectl set image deployment/hedera-web-cron-$BRANCH_NAME hedera-web-cron-$BRANCH_NAME=$REGISTRY/hedera-web:$VERSION' + sh 'kubectl set image deployment/hedera-web-$BRANCH_NAME hedera-web-$BRANCH_NAME=$REGISTRY/hedera-web:$TAG' + sh 'kubectl set image deployment/hedera-web-cron-$BRANCH_NAME hedera-web-cron-$BRANCH_NAME=$REGISTRY/hedera-web:$TAG' } } } -- 2.40.1 From 3db9314dfd0eea2f912d0755a90b073eaa92b063 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 9 Jul 2024 12:16:31 +0200 Subject: [PATCH 45/68] ci: refs #7643 Reprepro debug & docker deploy improve --- Jenkinsfile | 14 +++++++++----- docker-compose.yml | 5 +---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a74e7fdc..75de98cb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,7 +39,7 @@ pipeline { sh 'debuild -us -uc -b' sh 'mkdir -p output' sh 'mv ../*.deb ../*.build ../*.buildinfo ../*.changes output' - sleep 600 + sleep 1800 stash includes: 'output/*', name: 'debuildOutput' } @@ -95,6 +95,7 @@ pipeline { } environment { CREDS = credentials('docker-registry') + IMAGE = "$REGISTRY/verdnatura/hedera-web" } steps { script { @@ -103,17 +104,20 @@ pipeline { env.TAG = "${packageJson.version}-build${env.BUILD_ID}" } - sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY' sh 'docker-compose build --build-arg BUILD_ID=$BUILD_ID --parallel' - sh 'docker-compose push' + sh "docker tag $IMAGE:$TAG $IMAGE:latest" + + sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY' + sh "docker push $IMAGE:$TAG" + sh "docker push $IMAGE:latest" withKubeConfig([ serverUrl: "$KUBERNETES_API", credentialsId: 'kubernetes', namespace: 'salix' ]) { - sh 'kubectl set image deployment/hedera-web-$BRANCH_NAME hedera-web-$BRANCH_NAME=$REGISTRY/hedera-web:$TAG' - sh 'kubectl set image deployment/hedera-web-cron-$BRANCH_NAME hedera-web-cron-$BRANCH_NAME=$REGISTRY/hedera-web:$TAG' + sh 'kubectl set image deployment/hedera-web-$BRANCH_NAME hedera-web-$BRANCH_NAME=$IMAGE:$TAG' + sh 'kubectl set image deployment/hedera-web-cron-$BRANCH_NAME hedera-web-cron-$BRANCH_NAME=$IMAGE:$TAG' } } } diff --git a/docker-compose.yml b/docker-compose.yml index 0a1a862d..ff930121 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,12 +1,9 @@ version: '3.7' services: main: - image: registry.verdnatura.es/hedera-web:${VERSION:?} + image: registry.verdnatura.es/verdnatura/hedera-web:${TAG:?} build: context: . dockerfile: Dockerfile args: - VERSION=${VERSION:?} - cron: - image: registry.verdnatura.es/hedera-web:${VERSION:?} - command: 'cron -f' -- 2.40.1 From bdf7a1600388e2714875920e34a71495ad4ccdac Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 9 Jul 2024 15:43:55 +0200 Subject: [PATCH 46/68] ci: refs #7643 Reprepro debug --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 75de98cb..0b47bcd9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,7 +39,7 @@ pipeline { sh 'debuild -us -uc -b' sh 'mkdir -p output' sh 'mv ../*.deb ../*.build ../*.buildinfo ../*.changes output' - sleep 1800 + sleep 3600 stash includes: 'output/*', name: 'debuildOutput' } -- 2.40.1 From ddaff6afe93ba689edca6a2ccbbd94f3a32e03e5 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 9 Jul 2024 16:55:20 +0200 Subject: [PATCH 47/68] ci: refs #7643 Reprepro debug --- Jenkinsfile | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0b47bcd9..1f0bfb9e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ def BRANCH_ENV = [ master: 'production' ] def remote = [:] -def debFile +def changesFile node { stage('Setup') { @@ -38,8 +38,8 @@ pipeline { steps { sh 'debuild -us -uc -b' sh 'mkdir -p output' - sh 'mv ../*.deb ../*.build ../*.buildinfo ../*.changes output' - sleep 3600 + sh 'mv ../*.deb ../*.build ../*.changes output' + sleep 86400 stash includes: 'output/*', name: 'debuildOutput' } @@ -52,14 +52,13 @@ pipeline { } } environment { - REPREPRO_DIR = '/var/lib/reprepro' - REPO_DIR = "$REPREPRO_DIR/repo" + REPREPRO_BASE_DIR = '/var/lib/reprepro/repo' } steps { unstash 'debuildOutput' script { - def files = findFiles(glob: 'output/*.deb') - files.each { file -> debFile = file.name } + def files = findFiles(glob: 'output/*.changes') + files.each { file -> changesFile = file.name } } withCredentials([sshUserPrivateKey( @@ -76,12 +75,12 @@ pipeline { } sshPut([ remote: remote, - from: "output/$debFile", - into: "$REPO_DIR/incoming" + from: "output/$changesFile", + into: "$REPREPRO_BASE_DIR/incoming" ]) sshCommand([ remote: remote, - command: "reprepro -b $REPO_DIR --gnupghome $REPREPRO_DIR/.gnupg includedeb bookworm $REPO_DIR/incoming/$debFile" + command: "reprepro processincoming default $changesFile" ]) } } @@ -105,11 +104,11 @@ pipeline { } sh 'docker-compose build --build-arg BUILD_ID=$BUILD_ID --parallel' - sh "docker tag $IMAGE:$TAG $IMAGE:latest" + sh 'docker tag $IMAGE:$TAG $IMAGE:latest' sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY' - sh "docker push $IMAGE:$TAG" - sh "docker push $IMAGE:latest" + sh 'docker push $IMAGE:$TAG' + sh 'docker push $IMAGE:latest' withKubeConfig([ serverUrl: "$KUBERNETES_API", -- 2.40.1 From 8a022aac66c80fb136038f7e0e46a4c99a762b9c Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 9 Jul 2024 17:03:57 +0200 Subject: [PATCH 48/68] ci: refs #7643 Reprepro debug --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1f0bfb9e..8d232db4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,7 +38,7 @@ pipeline { steps { sh 'debuild -us -uc -b' sh 'mkdir -p output' - sh 'mv ../*.deb ../*.build ../*.changes output' + sh 'mv ../*.deb ../*.build ../*.changes ../*.buildinfo output' sleep 86400 stash includes: 'output/*', name: 'debuildOutput' -- 2.40.1 From fd11c1ea009058964b375b662936f4ae5c689285 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 9 Jul 2024 17:31:24 +0200 Subject: [PATCH 49/68] ci: refs #7643 Reprepro debug --- Jenkinsfile | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8d232db4..e49dcdff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,11 +37,29 @@ pipeline { } steps { sh 'debuild -us -uc -b' - sh 'mkdir -p output' - sh 'mv ../*.deb ../*.build ../*.changes ../*.buildinfo output' - sleep 86400 + //sh 'mkdir -p output' + //sh 'mv ../*.deb ../*.build ../*.changes ../*.buildinfo output' - stash includes: 'output/*', name: 'debuildOutput' + script { + def files = findFiles(glob: '../*.changes') + files.each { file -> changesFile = file.name } + } + + withCredentials([sshUserPrivateKey( + credentialsId: 'jenkins-agent', + keyFileVariable: 'keyFile' + )]) { + configFileProvider([ + configFile(fileId: "dput.cf", + variable: 'DPUT_CONFIG') + ]) { + echo changesFile + echo 'dput --config $DPUT_CONFIG verdnatura' + sleep 86400 + } + } + + //stash includes: 'output/*', name: 'debuildOutput' } } stage('Reprepro') { -- 2.40.1 From 518638716297d2b458c6183b31680b2c79d8d8b2 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 10 Jul 2024 10:54:47 +0200 Subject: [PATCH 50/68] ci: refs #7643 Reprepro debug --- Jenkinsfile | 61 +++++++++-------------------------------------------- 1 file changed, 10 insertions(+), 51 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e49dcdff..8ca2803e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,70 +37,29 @@ pipeline { } steps { sh 'debuild -us -uc -b' - //sh 'mkdir -p output' - //sh 'mv ../*.deb ../*.build ../*.changes ../*.buildinfo output' script { - def files = findFiles(glob: '../*.changes') - files.each { file -> changesFile = file.name } + def files = findFiles(glob: '../hedera-web_*.changes') + files.each { file -> env.CHANGES_FILE = file.name } } withCredentials([sshUserPrivateKey( credentialsId: 'jenkins-agent', - keyFileVariable: 'keyFile' + keyFileVariable: 'KEY_FILE' )]) { + sh 'eval "$(ssh-agent -s)"' + sh 'ssh-add "$KEY_FILE"' + configFileProvider([ configFile(fileId: "dput.cf", variable: 'DPUT_CONFIG') ]) { - echo changesFile - echo 'dput --config $DPUT_CONFIG verdnatura' - sleep 86400 + echo env.DPUT_CONFIG + echo env.KEY_FILE + echo env.CHANGES_FILE + sh 'dput --config "$DPUT_CONFIG" verdnatura "$CHANGES_FILE"' } } - - //stash includes: 'output/*', name: 'debuildOutput' - } - } - stage('Reprepro') { - when { - anyOf { - branch 'master' - branch 'test' - } - } - environment { - REPREPRO_BASE_DIR = '/var/lib/reprepro/repo' - } - steps { - unstash 'debuildOutput' - script { - def files = findFiles(glob: 'output/*.changes') - files.each { file -> changesFile = file.name } - } - - withCredentials([sshUserPrivateKey( - credentialsId: 'jenkins-agent', - usernameVariable: 'user', - keyFileVariable: 'keyFile' - )]) { - script { - remote.user = user - remote.identityFile = keyFile - remote.name = 'reprepro' - remote.host = 'reprepro.reprepro' - remote.allowAnyHosts = true - } - sshPut([ - remote: remote, - from: "output/$changesFile", - into: "$REPREPRO_BASE_DIR/incoming" - ]) - sshCommand([ - remote: remote, - command: "reprepro processincoming default $changesFile" - ]) - } } } stage('Deploy') { -- 2.40.1 From f863d8a897271ec27be7e4044e65e387ca2f83c2 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 10 Jul 2024 11:16:19 +0200 Subject: [PATCH 51/68] ci: refs #7643 Debuild debug --- Jenkinsfile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8ca2803e..0ed1b18b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,6 @@ def BRANCH_ENV = [ master: 'production' ] def remote = [:] -def changesFile node { stage('Setup') { @@ -43,19 +42,12 @@ pipeline { files.each { file -> env.CHANGES_FILE = file.name } } - withCredentials([sshUserPrivateKey( - credentialsId: 'jenkins-agent', - keyFileVariable: 'KEY_FILE' - )]) { - sh 'eval "$(ssh-agent -s)"' - sh 'ssh-add "$KEY_FILE"' - + sshagent(credentials: ['jenkins-agent']) { configFileProvider([ configFile(fileId: "dput.cf", variable: 'DPUT_CONFIG') ]) { echo env.DPUT_CONFIG - echo env.KEY_FILE echo env.CHANGES_FILE sh 'dput --config "$DPUT_CONFIG" verdnatura "$CHANGES_FILE"' } -- 2.40.1 From 47acbb7ebb9731b7ce5f43fae943995aea3c9cd3 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 10 Jul 2024 11:19:05 +0200 Subject: [PATCH 52/68] ci: refs #7643 Debuild dput debug --- Jenkinsfile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0ed1b18b..58c58c00 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,20 +36,19 @@ pipeline { } steps { sh 'debuild -us -uc -b' - script { def files = findFiles(glob: '../hedera-web_*.changes') files.each { file -> env.CHANGES_FILE = file.name } } - sshagent(credentials: ['jenkins-agent']) { - configFileProvider([ - configFile(fileId: "dput.cf", - variable: 'DPUT_CONFIG') - ]) { + configFileProvider([ + configFile(fileId: "dput.cf", + variable: 'DPUT_CONFIG') + ]) { + sshagent(credentials: ['jenkins-agent']) { echo env.DPUT_CONFIG echo env.CHANGES_FILE - sh 'dput --config "$DPUT_CONFIG" verdnatura "$CHANGES_FILE"' + sh 'dput --config "$DPUT_CONFIG" verdnatura "../hedera-web_*.changes"' } } } -- 2.40.1 From 1f373f1bc3109c1ac7a273b05c10730b13213dec Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 10 Jul 2024 11:20:59 +0200 Subject: [PATCH 53/68] ci: refs #7643 Debuild dput debug --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 58c58c00..61525cb9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,7 +48,7 @@ pipeline { sshagent(credentials: ['jenkins-agent']) { echo env.DPUT_CONFIG echo env.CHANGES_FILE - sh 'dput --config "$DPUT_CONFIG" verdnatura "../hedera-web_*.changes"' + sh 'dput --config "$DPUT_CONFIG" verdnatura "../"' } } } -- 2.40.1 From 21da29ab8d40a11988080996417e2edb6e9b9c4f Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 10 Jul 2024 11:23:18 +0200 Subject: [PATCH 54/68] ci: refs #7643 Debuild dput debug --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 61525cb9..996e1917 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,7 +48,8 @@ pipeline { sshagent(credentials: ['jenkins-agent']) { echo env.DPUT_CONFIG echo env.CHANGES_FILE - sh 'dput --config "$DPUT_CONFIG" verdnatura "../"' + sleep 86400 + sh 'dput --config "$DPUT_CONFIG" verdnatura "../$CHANGES_FILE"' } } } -- 2.40.1 From 5ac665266336502e2ac2846c71a4c90552e6245d Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 10 Jul 2024 11:31:08 +0200 Subject: [PATCH 55/68] ci: refs #7643 Debuild dput debug --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 996e1917..dcb6e86b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,8 +36,11 @@ pipeline { } steps { sh 'debuild -us -uc -b' + sh 'mkdir -p output' + sh 'mv ../*.deb ../*.build ../*.changes ../*.buildinfo output' + script { - def files = findFiles(glob: '../hedera-web_*.changes') + def files = findFiles(glob: 'output/*.changes') files.each { file -> env.CHANGES_FILE = file.name } } @@ -46,7 +49,6 @@ pipeline { variable: 'DPUT_CONFIG') ]) { sshagent(credentials: ['jenkins-agent']) { - echo env.DPUT_CONFIG echo env.CHANGES_FILE sleep 86400 sh 'dput --config "$DPUT_CONFIG" verdnatura "../$CHANGES_FILE"' -- 2.40.1 From fba0c734027ffd5eb75dd5f9e963e2c28473f29a Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 10 Jul 2024 12:18:05 +0200 Subject: [PATCH 56/68] ci: refs #7643 Debuild dput debug --- Jenkinsfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dcb6e86b..1d5b8f47 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,11 +36,12 @@ pipeline { } steps { sh 'debuild -us -uc -b' - sh 'mkdir -p output' - sh 'mv ../*.deb ../*.build ../*.changes ../*.buildinfo output' + sh 'mkdir -p debuild' + sh 'rm debuild/*' + sh 'mv ../hedera-web_* debuild' script { - def files = findFiles(glob: 'output/*.changes') + def files = findFiles(glob: 'debuild/*.changes') files.each { file -> env.CHANGES_FILE = file.name } } @@ -49,9 +50,7 @@ pipeline { variable: 'DPUT_CONFIG') ]) { sshagent(credentials: ['jenkins-agent']) { - echo env.CHANGES_FILE - sleep 86400 - sh 'dput --config "$DPUT_CONFIG" verdnatura "../$CHANGES_FILE"' + sh 'dput --config "$DPUT_CONFIG" verdnatura "debuild/$CHANGES_FILE"' } } } -- 2.40.1 From 4d81b6c5b2cd479e03e3b06d603878ab74e469ff Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 10 Jul 2024 12:19:57 +0200 Subject: [PATCH 57/68] ci: refs #7643 Debuild dput debug --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1d5b8f47..fd49dd17 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,6 @@ pipeline { steps { sh 'debuild -us -uc -b' sh 'mkdir -p debuild' - sh 'rm debuild/*' sh 'mv ../hedera-web_* debuild' script { -- 2.40.1 From c2f7ee1be8671f205fff9511bfc07869d45b662b Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 10 Jul 2024 12:30:56 +0200 Subject: [PATCH 58/68] ci: refs #7643 Debuild image updated --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index fd49dd17..61e0479d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { } agent { docker { - image 'registry.verdnatura.es/debuild:2.23.4-vn6' + image 'registry.verdnatura.es/verdnatura/debuild:2.23.4-vn7' registryUrl 'https://registry.verdnatura.es/' registryCredentialsId 'docker-registry' } -- 2.40.1 From 340c68406c2da704981d10e1ec9070f6dcda9bd5 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 10 Jul 2024 12:36:35 +0200 Subject: [PATCH 59/68] ci: refs #7643 Debuild image updated --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 61e0479d..f421cbe7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,6 @@ pipeline { agent { docker { image 'registry.verdnatura.es/verdnatura/debuild:2.23.4-vn7' - registryUrl 'https://registry.verdnatura.es/' registryCredentialsId 'docker-registry' } } -- 2.40.1 From 16d1e1fd69cf0bdf87975f8cb503b39920f44e57 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 10 Jul 2024 12:37:24 +0200 Subject: [PATCH 60/68] ci: refs #7643 Debuild image updated --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index f421cbe7..61e0479d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,6 +30,7 @@ pipeline { agent { docker { image 'registry.verdnatura.es/verdnatura/debuild:2.23.4-vn7' + registryUrl 'https://registry.verdnatura.es/' registryCredentialsId 'docker-registry' } } -- 2.40.1 From ddc5c2adc7462bdcd430b73053a52424df7c7b97 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 10 Jul 2024 12:48:01 +0200 Subject: [PATCH 61/68] ci: refs #7643 Jenkinsfile code clean --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 61e0479d..36d112c1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,8 +45,7 @@ pipeline { } configFileProvider([ - configFile(fileId: "dput.cf", - variable: 'DPUT_CONFIG') + configFile(fileId: "dput.cf", variable: 'DPUT_CONFIG') ]) { sshagent(credentials: ['jenkins-agent']) { sh 'dput --config "$DPUT_CONFIG" verdnatura "debuild/$CHANGES_FILE"' -- 2.40.1 From 099f494101b73f3a19e606ea67d0b2e5343e66a3 Mon Sep 17 00:00:00 2001 From: guillermo Date: Thu, 11 Jul 2024 11:40:11 +0200 Subject: [PATCH 62/68] feat: refs #7704 Change minQuantity --- forms/ecomerce/catalog/ui.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml index 26a80fda..1f3fae5c 100644 --- a/forms/ecomerce/catalog/ui.xml +++ b/forms/ecomerce/catalog/ui.xml @@ -117,7 +117,7 @@ SELECT i.id, i.longName item, i.subName, i.tag5, i.value5, i.tag6, i.value6, i.tag7, i.value7, i.tag8, i.value8, - i.relevancy, i.size, i.category, i.minQuantity, + i.relevancy, i.size, i.category, b.minQuantity, k.name ink, p.name producer, o.name origin, b.available, b.price, b.`grouping`, i.image, im.updated -- 2.40.1 From 7f2c64568284d0f0af8b955cb33f9d748f8a1f6c Mon Sep 17 00:00:00 2001 From: guillermo Date: Thu, 11 Jul 2024 13:36:21 +0200 Subject: [PATCH 63/68] feat: refs #7704 Refactor --- forms/ecomerce/catalog/ui.xml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml index 1f3fae5c..6e8aa100 100644 --- a/forms/ecomerce/catalog/ui.xml +++ b/forms/ecomerce/catalog/ui.xml @@ -105,8 +105,7 @@ auto-load="false" result-index="3" on-status-changed="onItemsChange"> - DROP TEMPORARY TABLE IF EXISTS tmp.item; - CREATE TEMPORARY TABLE tmp.item + CREATE OR REPLACE TEMPORARY TABLE tmp.item (INDEX (itemFk)) ENGINE = MEMORY SELECT i.id itemFk @@ -132,13 +131,7 @@ WHERE b.available > 0 ORDER BY i.relevancy DESC, i.name, i.size LIMIT 5000; - DROP TEMPORARY TABLE - tmp.item, - tmp.ticketCalculateItem, - tmp.ticketComponentPrice, - tmp.ticketComponent, - tmp.ticketLot, - tmp.zoneGetShipped; + CALL vn.ticketCalculatePurge(); -- 2.40.1 From 8929f8c55a415d8ca9889061b2b0b2ce3fff1c57 Mon Sep 17 00:00:00 2001 From: guillermo Date: Thu, 11 Jul 2024 14:32:56 +0200 Subject: [PATCH 64/68] feat: refs #7704 Refactor --- forms/ecomerce/catalog/ui.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml index 6e8aa100..731ef647 100644 --- a/forms/ecomerce/catalog/ui.xml +++ b/forms/ecomerce/catalog/ui.xml @@ -131,6 +131,7 @@ WHERE b.available > 0 ORDER BY i.relevancy DESC, i.name, i.size LIMIT 5000; + DROP TEMPORARY TABLE tmp.item; CALL vn.ticketCalculatePurge(); -- 2.40.1 From 1c54922692bd55a97913f3d19664b8786962e79a Mon Sep 17 00:00:00 2001 From: guillermo Date: Thu, 11 Jul 2024 14:33:15 +0200 Subject: [PATCH 65/68] feat: refs #7704 Refactor --- forms/ecomerce/catalog/ui.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml index 731ef647..a5bf966a 100644 --- a/forms/ecomerce/catalog/ui.xml +++ b/forms/ecomerce/catalog/ui.xml @@ -125,8 +125,7 @@ LEFT JOIN vn.ink k ON k.id = i.inkFk LEFT JOIN vn.producer p ON p.id = i.producerFk LEFT JOIN vn.origin o ON o.id = i.originFk - LEFT JOIN image im - ON im.collectionFk = 'catalog' + LEFT JOIN image im ON im.collectionFk = 'catalog' AND im.name = i.image WHERE b.available > 0 ORDER BY i.relevancy DESC, i.name, i.size -- 2.40.1 From 90dea8fde96f8d8684c661f3d68ad3a44722d338 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 15 Jul 2024 10:32:11 +0200 Subject: [PATCH 66/68] ci(Jenkinsfile): refs #7643 Tag only master as latest --- Jenkinsfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 36d112c1..ef4c3583 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -72,11 +72,15 @@ pipeline { } sh 'docker-compose build --build-arg BUILD_ID=$BUILD_ID --parallel' - sh 'docker tag $IMAGE:$TAG $IMAGE:latest' - sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY' sh 'docker push $IMAGE:$TAG' - sh 'docker push $IMAGE:latest' + + script { + if (env.BRANCH_NAME == 'master') { + sh 'docker tag $IMAGE:$TAG $IMAGE:latest' + sh 'docker push $IMAGE:latest' + } + } withKubeConfig([ serverUrl: "$KUBERNETES_API", -- 2.40.1 From aaa9d3440450d6ef571d5cad1871fb9be5fd3cd3 Mon Sep 17 00:00:00 2001 From: guillermo Date: Fri, 19 Jul 2024 09:40:10 +0200 Subject: [PATCH 67/68] Version increased --- debian/changelog | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 94c26ae4..df56d57e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (24.14.8) stable; urgency=low +hedera-web (24.14.9) stable; urgency=low * Initial Release. diff --git a/package.json b/package.json index a5c99e4c..6ff6a431 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "24.14.8", + "version": "24.14.9", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { -- 2.40.1 From 93562bb4dde34decc3333ce0e0411b2359938a4b Mon Sep 17 00:00:00 2001 From: guillermo Date: Fri, 19 Jul 2024 10:25:23 +0200 Subject: [PATCH 68/68] fix: refs #7704 Bug fix --- debian/changelog | 2 +- forms/ecomerce/catalog/ui.xml | 3 ++- package.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index df56d57e..ab278d6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (24.14.9) stable; urgency=low +hedera-web (24.14.10) stable; urgency=low * Initial Release. diff --git a/forms/ecomerce/catalog/ui.xml b/forms/ecomerce/catalog/ui.xml index a5bf966a..4e5c543e 100644 --- a/forms/ecomerce/catalog/ui.xml +++ b/forms/ecomerce/catalog/ui.xml @@ -105,7 +105,8 @@ auto-load="false" result-index="3" on-status-changed="onItemsChange"> - CREATE OR REPLACE TEMPORARY TABLE tmp.item + DROP TEMPORARY TABLE IF EXISTS tmp.item; + CREATE TEMPORARY TABLE tmp.item (INDEX (itemFk)) ENGINE = MEMORY SELECT i.id itemFk diff --git a/package.json b/package.json index 6ff6a431..6bdee49d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "24.14.9", + "version": "24.14.10", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { -- 2.40.1