From 9d2fdead31acd213871586e78becf03fc5363038 Mon Sep 17 00:00:00 2001 From: hoangvv Date: Wed, 8 Jan 2025 00:25:28 +0700 Subject: [PATCH 1/8] update --- Jenkinsfile | 1 + Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6a5f76df..d7bd6224a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,6 +8,7 @@ node('Node-Dev-100163') { sh 'make clean_up' } stage('Build') { + sh "sed -i 's/TAG := \\$\\(shell rev-parse --abbrev-ref HEAD\\)/TAG := ${env.BRANCH_NAME}/g' Makefile" sh 'make install' sh 'make stop_server_docker' sh 'make gen_config' diff --git a/Makefile b/Makefile index 2f640b358..cb12d6ca9 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ SETUP_PATH=${PWD}/setup HASH := $(shell git rev-parse HEAD) CONFIG=odoo.conf ODOO_IMAGE=hub.nextzenos.com/nexterp/odoo -TAG := main +TAG := $(shell rev-parse --abbrev-ref HEAD) CONTAINER_ID=odoo-${TAG} install: sudo apt -y update && \ From d28d7501ed13e319a3b03d97d71c4dc510880231 Mon Sep 17 00:00:00 2001 From: hoangvv Date: Wed, 8 Jan 2025 00:27:13 +0700 Subject: [PATCH 2/8] update --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d7bd6224a..685743276 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ node('Node-Dev-100163') { sh 'make clean_up' } stage('Build') { - sh "sed -i 's/TAG := \\$\\(shell rev-parse --abbrev-ref HEAD\\)/TAG := ${env.BRANCH_NAME}/g' Makefile" + sh """sed -i 's/TAG := \\$\\(shell rev-parse --abbrev-ref HEAD\\)/TAG := ${env.BRANCH_NAME}/g' Makefile""" sh 'make install' sh 'make stop_server_docker' sh 'make gen_config' From 7e8fdefd2fcb69e80f02d3a1da0341298ee1dda3 Mon Sep 17 00:00:00 2001 From: hoangvv Date: Wed, 8 Jan 2025 00:30:24 +0700 Subject: [PATCH 3/8] update --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 685743276..c23794d54 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ node('Node-Dev-100163') { sh 'make clean_up' } stage('Build') { - sh """sed -i 's/TAG := \\$\\(shell rev-parse --abbrev-ref HEAD\\)/TAG := ${env.BRANCH_NAME}/g' Makefile""" + sh 'sed -i s/TAG := \$(shell rev-parse --abbrev-ref HEAD)/TAG := ${env.BRANCH_NAME}/g Makefile' sh 'make install' sh 'make stop_server_docker' sh 'make gen_config' From 4eb7d2b9a54c749869f5d37d24ef197be866c43d Mon Sep 17 00:00:00 2001 From: hoangvv Date: Wed, 8 Jan 2025 00:36:16 +0700 Subject: [PATCH 4/8] update --- Jenkinsfile | 2 +- setup/update_tag.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100755 setup/update_tag.sh diff --git a/Jenkinsfile b/Jenkinsfile index c23794d54..1266dc62f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ node('Node-Dev-100163') { sh 'make clean_up' } stage('Build') { - sh 'sed -i s/TAG := \$(shell rev-parse --abbrev-ref HEAD)/TAG := ${env.BRANCH_NAME}/g Makefile' + sh './setup/update_tag.sh ${env.BRANCH_NAME}' sh 'make install' sh 'make stop_server_docker' sh 'make gen_config' diff --git a/setup/update_tag.sh b/setup/update_tag.sh new file mode 100755 index 000000000..5ba44f910 --- /dev/null +++ b/setup/update_tag.sh @@ -0,0 +1,3 @@ +#!/usr/bin/bash + +sed -i "s/TAG := \$(shell rev-parse --abbrev-ref HEAD)/TAG := $1/g" Makefile From 4a39d75d3b3629634d5b365998cc2df51c2cb206 Mon Sep 17 00:00:00 2001 From: hoangvv Date: Wed, 8 Jan 2025 00:37:35 +0700 Subject: [PATCH 5/8] update --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1266dc62f..4f530ea20 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,10 +5,10 @@ node('Node-Dev-100163') { checkout scm } stage('Cleanup') { + sh './setup/update_tag.sh ${env.BRANCH_NAME}' sh 'make clean_up' } stage('Build') { - sh './setup/update_tag.sh ${env.BRANCH_NAME}' sh 'make install' sh 'make stop_server_docker' sh 'make gen_config' From 6332fb5deec7494f60c2832a96ff487b12fa2e92 Mon Sep 17 00:00:00 2001 From: hoangvv Date: Wed, 8 Jan 2025 00:43:31 +0700 Subject: [PATCH 6/8] update --- Jenkinsfile | 2 +- Makefile | 2 ++ setup/update_tag.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4f530ea20..f00d81c62 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ node('Node-Dev-100163') { checkout scm } stage('Cleanup') { - sh './setup/update_tag.sh ${env.BRANCH_NAME}' + sh 'make update_tag CURR_BRANCH=${env.BRANCH_NAME}' sh 'make clean_up' } stage('Build') { diff --git a/Makefile b/Makefile index cb12d6ca9..d27f4a541 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,8 @@ run_server_docker: fi cd ${DEPLOY_PATH} &&\ ${DOCKER_COMPOSE_CMD} up -d +update_tag: + ${SETUP_PATH}/update_tag.sh $(CURR_BRANCH) restore_database: @echo "Checking for backup.zip in container..." @if sudo docker exec ${CONTAINER_ID} test -f /etc/odoo/backup/backup.zip; then \ diff --git a/setup/update_tag.sh b/setup/update_tag.sh index 5ba44f910..5a49c6516 100755 --- a/setup/update_tag.sh +++ b/setup/update_tag.sh @@ -1,3 +1,3 @@ #!/usr/bin/bash - +set +x sed -i "s/TAG := \$(shell rev-parse --abbrev-ref HEAD)/TAG := $1/g" Makefile From 223a3932de8e78897c49b66dff49192db1ec4ae4 Mon Sep 17 00:00:00 2001 From: hoangvv Date: Wed, 8 Jan 2025 00:46:09 +0700 Subject: [PATCH 7/8] update --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f00d81c62..0811bbd3b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ node('Node-Dev-100163') { checkout scm } stage('Cleanup') { - sh 'make update_tag CURR_BRANCH=${env.BRANCH_NAME}' + sh "make update_tag CURR_BRANCH=${env.BRANCH_NAME}" sh 'make clean_up' } stage('Build') { From e1a3f57c804c89fb7b8d938ee1db353fa6d3f6ae Mon Sep 17 00:00:00 2001 From: hoangvv Date: Wed, 8 Jan 2025 00:48:42 +0700 Subject: [PATCH 8/8] update --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index d27f4a541..36fbb07e1 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,6 @@ DOCKER_PUSH=$(DOCKERCMD) push DOCKER_IMAGE=$(DOCKERCMD) image DEPLOY_PATH=${PWD}/deployment SETUP_PATH=${PWD}/setup -HASH := $(shell git rev-parse HEAD) CONFIG=odoo.conf ODOO_IMAGE=hub.nextzenos.com/nexterp/odoo TAG := $(shell rev-parse --abbrev-ref HEAD)