From 4789a1f7e1416b5b98f79760d4d154c56d930423 Mon Sep 17 00:00:00 2001 From: Nelson Osagie Date: Sun, 19 May 2024 12:45:29 +0100 Subject: [PATCH 1/9] CICD --- Jenkinsfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..2143f84e06 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,16 @@ +pipeline { + agant any + + stages { + stage('Verify Branch') { + steps { + echo "$GIT_BRANCH" + } + } + stage('Docker Build') { + steps { + sh(script: 'docker compose build') + } + } + } +} \ No newline at end of file From f0ba01697071f2186284161df844c37d96759775 Mon Sep 17 00:00:00 2001 From: Nelson Osagie Date: Sun, 19 May 2024 12:53:43 +0100 Subject: [PATCH 2/9] update CICD --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2143f84e06..a6ea03f654 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agant any + agent any stages { stage('Verify Branch') { From 900576b0301b459283bd711e5400e5dc4a5b1141 Mon Sep 17 00:00:00 2001 From: Nelson Osagie Date: Sun, 19 May 2024 18:55:11 +0100 Subject: [PATCH 3/9] updated jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a6ea03f654..ae7dbe1964 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { } stage('Docker Build') { steps { - sh(script: 'docker compose build') + sh(script: 'docker-compose build') } } } From 3a7ccadd8875fb0ba15a2c65377bbb72612880a9 Mon Sep 17 00:00:00 2001 From: Nelson Osagie Date: Sun, 19 May 2024 20:56:52 +0100 Subject: [PATCH 4/9] adding new tests --- test_sample.py | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 test_sample.py diff --git a/test_sample.py b/test_sample.py new file mode 100644 index 0000000000..0245d76852 --- /dev/null +++ b/test_sample.py @@ -0,0 +1,6 @@ +def inc(x): + return x + 1 + + +def test_output(): + assert inc(5) == 4 From b6bbd84a2a767fd902daeb7da549564d16ce0a73 Mon Sep 17 00:00:00 2001 From: Nelson Osagie Date: Sun, 19 May 2024 22:24:17 +0100 Subject: [PATCH 5/9] test new feature --- test_sample.py => feature/test_sample.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test_sample.py => feature/test_sample.py (100%) diff --git a/test_sample.py b/feature/test_sample.py similarity index 100% rename from test_sample.py rename to feature/test_sample.py From 5ebd702982fdda0184c05759833b760550bf2e49 Mon Sep 17 00:00:00 2001 From: Nelson Osagie Date: Sun, 19 May 2024 22:26:32 +0100 Subject: [PATCH 6/9] test new feature --- feature/test_sample.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/test_sample.py b/feature/test_sample.py index 0245d76852..2202658c86 100644 --- a/feature/test_sample.py +++ b/feature/test_sample.py @@ -3,4 +3,4 @@ def inc(x): def test_output(): - assert inc(5) == 4 + assert inc(5) == 3 From 3d91958ac2a5c3561eb81590740c0a5716853ca0 Mon Sep 17 00:00:00 2001 From: Nelson Osagie Date: Sun, 19 May 2024 23:03:55 +0100 Subject: [PATCH 7/9] fix conflicting port --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 1e868d2ebc..a2b86e9b8e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -15,4 +15,4 @@ services: environment: REDIS: azure-vote-back ports: - - "8080:80" + - "8080-8090:80" From 7d3bea32a7159de81d9fa0654e93a5d5aefb0e4b Mon Sep 17 00:00:00 2001 From: Nelson Osagie Date: Sun, 19 May 2024 23:15:26 +0100 Subject: [PATCH 8/9] fix conflicting port --- Jenkinsfile | 28 ++++++++++++++++++++++++++++ docker-compose.yaml | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ae7dbe1964..efbea0ca25 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,10 +7,38 @@ pipeline { echo "$GIT_BRANCH" } } + stage('Shutdown docker compose') { + steps { + sh(script: 'docker-compose down -v') + } + } stage('Docker Build') { steps { sh(script: 'docker-compose build') } } + stage('Start App') { + steps { + sh(script: 'docker-compose up -d --publish-all') + } + } + stage('Run Test') { + steps { + sh(script: 'pytest ./feature/test_sample.py') + } + post { + success { + echo "Test passed! :)" + } + failure { + echo "Test Failed! :(" + } + } + } + } + post { + always { + sh(script: 'docker-compose down -v --rmi all') + } } } \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index a2b86e9b8e..4449e794d5 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -15,4 +15,4 @@ services: environment: REDIS: azure-vote-back ports: - - "8080-8090:80" + - "8080-8090:81" From 837c5b54e3e7c200ed212ffad91ab6524dd17274 Mon Sep 17 00:00:00 2001 From: Nelson Osagie Date: Sun, 19 May 2024 23:28:48 +0100 Subject: [PATCH 9/9] fix pytest --- feature/test_sample.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/test_sample.py b/feature/test_sample.py index 2202658c86..671cf47a2b 100644 --- a/feature/test_sample.py +++ b/feature/test_sample.py @@ -3,4 +3,4 @@ def inc(x): def test_output(): - assert inc(5) == 3 + assert inc(5) == 6