From d3af3ac81bf1c29c107a4ee6a00bbcdf7ec27283 Mon Sep 17 00:00:00 2001 From: Hanbin Lee Date: Mon, 6 Feb 2023 00:01:57 +0900 Subject: [PATCH 01/11] =?UTF-8?q?Jenkinsfile=20test=EB=A5=BC=20=EC=9C=84?= =?UTF-8?q?=ED=95=9C=20git=20clone=20=EC=A3=BC=EC=84=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile-service | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile-service b/Jenkinsfile-service index 2797aad..6ab7bd0 100644 --- a/Jenkinsfile-service +++ b/Jenkinsfile-service @@ -11,11 +11,11 @@ pipeline { } } - stage('Github clone') { - steps { - git branch: '${BUILD_BRANCH}', url: 'https://github.com/beaniejoy/dongne-cafe-api.git' - } - } +// stage('Github clone') { +// steps { +// git branch: '${BUILD_BRANCH}', url: 'https://github.com/beaniejoy/dongne-cafe-api.git' +// } +// } stage('Test') { steps { From af67ae124b3a277b3ebdd35df0742c45f3bd546d Mon Sep 17 00:00:00 2001 From: Hanbin Lee Date: Mon, 6 Feb 2023 01:20:45 +0900 Subject: [PATCH 02/11] [#31] feat: add DB migration stage --- script/db_migration.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 script/db_migration.sh diff --git a/script/db_migration.sh b/script/db_migration.sh new file mode 100644 index 0000000..eddb78a --- /dev/null +++ b/script/db_migration.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +cd .. + +./gradlew :db:flywayInfo + +./gradlew :db:flywayValidate \ No newline at end of file From 88e162fa4399f86e2beca7b911bba6554378a846 Mon Sep 17 00:00:00 2001 From: Hanbin Lee Date: Mon, 6 Feb 2023 01:21:12 +0900 Subject: [PATCH 03/11] [#31] feat: add DB migration stage --- Jenkinsfile-service | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile-service b/Jenkinsfile-service index 6ab7bd0..f8e1ee9 100644 --- a/Jenkinsfile-service +++ b/Jenkinsfile-service @@ -11,11 +11,11 @@ pipeline { } } -// stage('Github clone') { -// steps { -// git branch: '${BUILD_BRANCH}', url: 'https://github.com/beaniejoy/dongne-cafe-api.git' -// } -// } + stage('DB Migrate') { + steps { + sh './script/db_migration.sh' + } + } stage('Test') { steps { From 3a4f79fbdb2ed8dc9780b61224b7ba52864acef9 Mon Sep 17 00:00:00 2001 From: Hanbin Lee Date: Sun, 19 Feb 2023 17:32:58 +0900 Subject: [PATCH 04/11] =?UTF-8?q?[#31]=20feat:=20Jenkinsfile=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EC=A7=84=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile-service | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile-service b/Jenkinsfile-service index f8e1ee9..54559ee 100644 --- a/Jenkinsfile-service +++ b/Jenkinsfile-service @@ -8,12 +8,17 @@ pipeline { stage('Init') { steps { sh 'printenv' + + migration_script = './script/db_migration.sh' } } stage('DB Migrate') { steps { - sh './script/db_migration.sh' + sh """ + chmod 755 ${migration_script} + /bin/bash ${migration_script} + """ } } From 1beaaad422bc73d375acdc5e66b559c9b85c8271 Mon Sep 17 00:00:00 2001 From: Hanbin Lee Date: Thu, 2 Mar 2023 01:57:54 +0900 Subject: [PATCH 05/11] =?UTF-8?q?[#33]=20test:=20jenkins=20cloud=20server?= =?UTF-8?q?=20=EA=B5=AC=EC=B6=95=20=EB=B0=8F=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile-service | 35 ++++++++++++++++++----------------- db/build.gradle.kts | 3 +-- db/{conf => }/flyway.conf | 3 ++- script/db_migration.sh | 7 ++++--- 4 files changed, 25 insertions(+), 23 deletions(-) rename db/{conf => }/flyway.conf (64%) diff --git a/Jenkinsfile-service b/Jenkinsfile-service index 54559ee..073ae69 100644 --- a/Jenkinsfile-service +++ b/Jenkinsfile-service @@ -1,37 +1,38 @@ pipeline { agent any - tools { - jdk("openjdk-17") - } +// tools { +// jdk("openjdk-17") +// } stages { stage('Init') { steps { sh 'printenv' - migration_script = './script/db_migration.sh' + FLYWAY_CONFIG = '/home/ec2-user/flyway/flyway.conf' + MIGRATION_SCRIPT = './script/db_migration.sh' } } stage('DB Migrate') { steps { sh """ - chmod 755 ${migration_script} - /bin/bash ${migration_script} + chmod 755 ${MIGRATION_SCRIPT} + /bin/bash ${MIGRATION_SCRIPT} ${FLYWAY_CONFIG} """ } } - stage('Test') { - steps { - sh './gradlew clean :dongne-service-api:test' - } - } - - stage('Build') { - steps { - sh './gradlew clean :dongne-service-api:build -x test' - } - } +// stage('Test') { +// steps { +// sh './gradlew clean :dongne-service-api:test' +// } +// } +// +// stage('Build') { +// steps { +// sh './gradlew clean :dongne-service-api:build -x test' +// } +// } } } \ No newline at end of file diff --git a/db/build.gradle.kts b/db/build.gradle.kts index 5a2cb97..7415256 100644 --- a/db/build.gradle.kts +++ b/db/build.gradle.kts @@ -19,8 +19,7 @@ flyway { baselineDescription = "Start Flyway Migration!" baselineOnMigrate = true baselineVersion = "000" - locations = arrayOf("filesystem:./migration", "filesystem:./seed") - configFiles = arrayOf("conf/flyway.conf") + configFiles = arrayOf(System.getProperty("config") ?: "flyway.conf") cleanDisabled = false // activate flywayClean ignoreMigrationPatterns = arrayOf("*:pending") // ignore validating pending(대기) state } \ No newline at end of file diff --git a/db/conf/flyway.conf b/db/flyway.conf similarity index 64% rename from db/conf/flyway.conf rename to db/flyway.conf index 4a5a3f1..1af2acc 100644 --- a/db/conf/flyway.conf +++ b/db/flyway.conf @@ -1,4 +1,5 @@ flyway.url=jdbc:mysql://localhost:3306/dongne?autoreconnect=true&characterEncoding=utf8&serverTimezone=Asia/Seoul flyway.user=root flyway.password=beaniejoy -flyway.driver=com.mysql.cj.jdbc.Driver \ No newline at end of file +flyway.driver=com.mysql.cj.jdbc.Driver +flyway.locations=filesystem:db/migration,db/seed \ No newline at end of file diff --git a/script/db_migration.sh b/script/db_migration.sh index eddb78a..a6ae826 100644 --- a/script/db_migration.sh +++ b/script/db_migration.sh @@ -1,7 +1,8 @@ #!/bin/bash -cd .. +pwd -./gradlew :db:flywayInfo +echo "param: $1" +#./gradlew :db:flywayInfo -Dconfig=$1 -./gradlew :db:flywayValidate \ No newline at end of file +#./gradlew :db:flywayValidate -Dconfig=$1 \ No newline at end of file From a39084a11a6e4486acea70ebe17473753b1d72e6 Mon Sep 17 00:00:00 2001 From: Hanbin Lee Date: Thu, 2 Mar 2023 02:01:18 +0900 Subject: [PATCH 06/11] =?UTF-8?q?[#33]=20test:=20jenkins=20cloud=20server?= =?UTF-8?q?=20=EA=B5=AC=EC=B6=95=20=EB=B0=8F=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile-service | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile-service b/Jenkinsfile-service index 073ae69..5f20281 100644 --- a/Jenkinsfile-service +++ b/Jenkinsfile-service @@ -7,10 +7,12 @@ pipeline { stages { stage('Init') { steps { - sh 'printenv' + script { + sh 'printenv' - FLYWAY_CONFIG = '/home/ec2-user/flyway/flyway.conf' - MIGRATION_SCRIPT = './script/db_migration.sh' + FLYWAY_CONFIG = '/home/ec2-user/flyway/flyway.conf' + MIGRATION_SCRIPT = './script/db_migration.sh' + } } } From 09b6beee531f80355bf171fcdb36405e08e2bc2d Mon Sep 17 00:00:00 2001 From: Hanbin Lee Date: Thu, 2 Mar 2023 02:07:06 +0900 Subject: [PATCH 07/11] =?UTF-8?q?[#33]=20test:=20flyway=20migration=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/db_migration.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/script/db_migration.sh b/script/db_migration.sh index a6ae826..25bc756 100644 --- a/script/db_migration.sh +++ b/script/db_migration.sh @@ -1,8 +1,7 @@ #!/bin/bash -pwd +echo "#### Flyway Config File: $1" -echo "param: $1" -#./gradlew :db:flywayInfo -Dconfig=$1 +./gradlew :db:flywayInfo -Dconfig=$1 -#./gradlew :db:flywayValidate -Dconfig=$1 \ No newline at end of file +./gradlew :db:flywayValidate -Dconfig=$1 \ No newline at end of file From 2d142eb82942e59753e5b6ce8d772bc3d233324a Mon Sep 17 00:00:00 2001 From: Hanbin Lee Date: Fri, 3 Mar 2023 00:19:30 +0900 Subject: [PATCH 08/11] =?UTF-8?q?[#33]=20test:=20jenkins=20=EC=B6=9C?= =?UTF-8?q?=EB=A0=A5=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile-service | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile-service b/Jenkinsfile-service index 5f20281..8126f1a 100644 --- a/Jenkinsfile-service +++ b/Jenkinsfile-service @@ -8,6 +8,7 @@ pipeline { stage('Init') { steps { script { + sh 'whoami' sh 'printenv' FLYWAY_CONFIG = '/home/ec2-user/flyway/flyway.conf' @@ -16,14 +17,14 @@ pipeline { } } - stage('DB Migrate') { - steps { - sh """ - chmod 755 ${MIGRATION_SCRIPT} - /bin/bash ${MIGRATION_SCRIPT} ${FLYWAY_CONFIG} - """ - } - } +// stage('DB Migrate') { +// steps { +// sh """ +// chmod 755 ${MIGRATION_SCRIPT} +// /bin/bash ${MIGRATION_SCRIPT} ${FLYWAY_CONFIG} +// """ +// } +// } // stage('Test') { // steps { From 54c4481031de53255547f7d684be5742c9797a58 Mon Sep 17 00:00:00 2001 From: Hanbin Lee Date: Fri, 3 Mar 2023 00:58:50 +0900 Subject: [PATCH 09/11] [#33] test: DB Migration test --- Jenkinsfile-service | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile-service b/Jenkinsfile-service index 8126f1a..acb43e8 100644 --- a/Jenkinsfile-service +++ b/Jenkinsfile-service @@ -17,14 +17,14 @@ pipeline { } } -// stage('DB Migrate') { -// steps { -// sh """ -// chmod 755 ${MIGRATION_SCRIPT} -// /bin/bash ${MIGRATION_SCRIPT} ${FLYWAY_CONFIG} -// """ -// } -// } + stage('DB Migrate') { + steps { + sh """ + chmod 755 ${MIGRATION_SCRIPT} + /bin/bash ${MIGRATION_SCRIPT} ${FLYWAY_CONFIG} + """ + } + } // stage('Test') { // steps { From 42c8b3df142c645d24f3cd31fe074eaea800d55b Mon Sep 17 00:00:00 2001 From: Hanbin Lee Date: Fri, 3 Mar 2023 01:28:34 +0900 Subject: [PATCH 10/11] =?UTF-8?q?[#33]=20test:=20migration=20>=20test=20>?= =?UTF-8?q?=20build=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile-service | 25 +++++++++++-------------- script/db_migration.sh | 10 +++++++--- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile-service b/Jenkinsfile-service index acb43e8..83f30f2 100644 --- a/Jenkinsfile-service +++ b/Jenkinsfile-service @@ -1,8 +1,5 @@ pipeline { agent any -// tools { -// jdk("openjdk-17") -// } stages { stage('Init') { @@ -26,16 +23,16 @@ pipeline { } } -// stage('Test') { -// steps { -// sh './gradlew clean :dongne-service-api:test' -// } -// } -// -// stage('Build') { -// steps { -// sh './gradlew clean :dongne-service-api:build -x test' -// } -// } + stage('Test') { + steps { + sh './gradlew clean :dongne-service-api:test' + } + } + + stage('Build') { + steps { + sh './gradlew clean :dongne-service-api:build -x test' + } + } } } \ No newline at end of file diff --git a/script/db_migration.sh b/script/db_migration.sh index 25bc756..ed9eaa7 100644 --- a/script/db_migration.sh +++ b/script/db_migration.sh @@ -1,7 +1,11 @@ #!/bin/bash -echo "#### Flyway Config File: $1" - +echo "================ 1. Flyway Info ================" ./gradlew :db:flywayInfo -Dconfig=$1 -./gradlew :db:flywayValidate -Dconfig=$1 \ No newline at end of file +echo "================ 2. Flyway Validate ============" +./gradlew :db:flywayValidate -Dconfig=$1 + +echo "================ 3. Flyway Validate ============" +./gradlew :db:flywayMigrate -Dconfig=$1 + From 0210499e662256a22e26a016102c24dd8b71d157 Mon Sep 17 00:00:00 2001 From: Hanbin Lee Date: Sat, 4 Mar 2023 00:31:14 +0900 Subject: [PATCH 11/11] =?UTF-8?q?[#33]=20modify:=20migration=20shell=20scr?= =?UTF-8?q?ipt=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/db_migration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/db_migration.sh b/script/db_migration.sh index ed9eaa7..c43b2d4 100644 --- a/script/db_migration.sh +++ b/script/db_migration.sh @@ -6,6 +6,6 @@ echo "================ 1. Flyway Info ================" echo "================ 2. Flyway Validate ============" ./gradlew :db:flywayValidate -Dconfig=$1 -echo "================ 3. Flyway Validate ============" +echo "================ 3. Flyway Migrate =============" ./gradlew :db:flywayMigrate -Dconfig=$1