From 130e9631ddc985a172ed9f3ef28cdc6ea8368a78 Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Sat, 10 Aug 2024 19:30:41 +0300 Subject: [PATCH 01/27] Update index.jsp --- webapp/src/main/webapp/index.jsp | 94 +++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 3 deletions(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index c833a72aec..68e6515b86 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1,3 +1,91 @@ -

Hello, Welcome to Simple DevOps Project !!

-

Deploying on a kubernetes using ansible for Valaxy Technologies

-

Glad to see you here

+ + + + + + Backyard BBQ + + + + + + + +
+

Welcome to my World

+

Where the grill is always hot, and the drinks are always cold!

+
+ + +
+ +

Our BBQ Menu

+
+
+
+

Grilled Burgers

+

Juicy, flame-grilled beef patties with all the fixings.

+
+
+
+
+

BBQ Ribs

+

Slow-cooked pork ribs, slathered in our signature BBQ sauce.

+
+
+
+
+

Grilled Vegetables

+

A mix of seasonal veggies, perfectly grilled and seasoned.

+
+
+
+ + +

Refreshing Drinks

+
+
+
+

Lemonade

+

Freshly squeezed lemons with a hint of mint.

+
+
+
+
+

Cold Brew Iced Coffee

+

Rich, smooth, and refreshing cold brew coffee.

+
+
+
+
+

Ice-Cold Beer

+

Your favorite brews, served ice-cold.

+
+
+
+
+ + + + + + + From 41e29ccbc8706853363c0e0eeb0e5ec3be69fc28 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 10 Aug 2024 21:40:11 +0300 Subject: [PATCH 02/27] Edited the Web H1 --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 68e6515b86..fa88b86755 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -30,7 +30,7 @@
-

Welcome to my World

+

Welcome to my End Course Project, where my World of Food awaits!

Where the grill is always hot, and the drinks are always cold!

From d47adeef7da2015d7425b00d267816726503162f Mon Sep 17 00:00:00 2001 From: root Date: Sat, 10 Aug 2024 22:09:08 +0300 Subject: [PATCH 03/27] this is a commit 2 --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index fa88b86755..bf90208d08 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -31,7 +31,7 @@

Welcome to my End Course Project, where my World of Food awaits!

-

Where the grill is always hot, and the drinks are always cold!

+

Where the grill is always hot, and the drinks are always cold!!

From 7690259714379fa1bea91e6e99a4cd73d12792a3 Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Sun, 11 Aug 2024 00:36:11 +0300 Subject: [PATCH 04/27] Create main.yml --- .github/workflows/main.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000000..5a4271405f --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,18 @@ +name: Trigger Jenkins Pipeline + +on: + push: + branches: + - main + +jobs: + trigger-jenkins: + runs-on: ubuntu-latest + steps: + - name: Trigger Jenkins + uses: appleboy/jenkins-action@v1.2.0 + with: + url: "http://your-jenkins-server/job/your-job-name/buildWithParameters" + user: ${{ secrets.JENKINS_USER }} + token: ${{ secrets.JENKINS_API_TOKEN }} + parameters: "YOUR_PARAM=your_value" From bbc1c6700390de4bd2c60abfb650bf56f21ddbdb Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Sun, 11 Aug 2024 00:46:21 +0300 Subject: [PATCH 05/27] Update main.yml --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5a4271405f..b0114675ec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: - name: Trigger Jenkins uses: appleboy/jenkins-action@v1.2.0 with: - url: "http://your-jenkins-server/job/your-job-name/buildWithParameters" - user: ${{ secrets.JENKINS_USER }} - token: ${{ secrets.JENKINS_API_TOKEN }} - parameters: "YOUR_PARAM=your_value" + url: "http://192.168.100.196:8080/job/EndCourseProject/" + user: ${{ secrets.JUSER }} + token: ${{ secrets.UTOKEN }} + From a3fe15810560e05c4cc2b77b21bfc52d970c79ed Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 21:41:03 +0300 Subject: [PATCH 06/27] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b0114675ec..d057c72ef5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: - name: Trigger Jenkins uses: appleboy/jenkins-action@v1.2.0 with: - url: "http://192.168.100.196:8080/job/EndCourseProject/" + url: "http://139.162.253.204:8080/job/EndCourseProject/" user: ${{ secrets.JUSER }} token: ${{ secrets.UTOKEN }} From 6214a84600c90b2e2cdecc431582c43f0c672f51 Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 21:46:21 +0300 Subject: [PATCH 07/27] Update index.jsp --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index bf90208d08..0fbf024ddb 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -31,7 +31,7 @@

Welcome to my End Course Project, where my World of Food awaits!

-

Where the grill is always hot, and the drinks are always cold!!

+

Where the grill is always hot, and the drinks are always cold!! IF YOU THIS THEN THE GITHUB ACTION INVOCATION WORKS

From af4d35302ea133fa23b1c4e1e4fdd4143325184b Mon Sep 17 00:00:00 2001 From: "imezra2014@gmail.com" Date: Wed, 14 Aug 2024 22:17:12 +0300 Subject: [PATCH 08/27] d --- t.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 t.txt diff --git a/t.txt b/t.txt new file mode 100644 index 0000000000..e69de29bb2 From 7dbccc1c5a544194768ab19c7295871ccc00097f Mon Sep 17 00:00:00 2001 From: "imezra2014@gmail.com" Date: Wed, 14 Aug 2024 22:22:26 +0300 Subject: [PATCH 09/27] added --- t.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/t.txt b/t.txt index e69de29bb2..092bfb9bdf 100644 --- a/t.txt +++ b/t.txt @@ -0,0 +1 @@ +yo From daf40eeb6bb0bfaa2e6661fc5b552c4f8d3c8b4e Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 22:32:34 +0300 Subject: [PATCH 10/27] Update main.yml --- .github/workflows/main.yml | 45 +++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d057c72ef5..6f3bf6754d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,18 +1,37 @@ -name: Trigger Jenkins Pipeline +# name: Trigger Jenkins Pipeline -on: - push: - branches: - - main +# on: +# push: +# branches: +# - main + +# jobs: +# trigger-jenkins: +# runs-on: ubuntu-latest +# steps: +# - name: Trigger Jenkins +# uses: appleboy/jenkins-action@v1.2.0 +# with: +# url: "http://139.162.253.204:8080//" +# user: ${{ secrets.JUSER }} +# token: ${{ secrets.UTOKEN }} + + + +on: push + +env: + JENKINS_HOST: http://139.162.253.204:8080/ ## jenkins base url + JENKINS_JOB: job/EndCourseProject ## builds the HelloWorld job inside testJobs + JENKINS_PARAMS: no jobs: - trigger-jenkins: + launch_jenkins_job: + name: trigger jenkins job runs-on: ubuntu-latest steps: - - name: Trigger Jenkins - uses: appleboy/jenkins-action@v1.2.0 - with: - url: "http://139.162.253.204:8080/job/EndCourseProject/" - user: ${{ secrets.JUSER }} - token: ${{ secrets.UTOKEN }} - + - name: Trigger Jenkins Job + uses: sbitio/trigger-jenkins-job@master + with: + user: ${{ secrets.JUSER }} + token: ${{ secrets.UTOKEN }} From 1ccb3e7df6530d2a4370bd846ea9a054e10b698d Mon Sep 17 00:00:00 2001 From: "imezra2014@gmail.com" Date: Wed, 14 Aug 2024 22:33:17 +0300 Subject: [PATCH 11/27] 1 --- t.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/t.txt b/t.txt index 092bfb9bdf..7fb014ab63 100644 --- a/t.txt +++ b/t.txt @@ -1 +1,2 @@ yo +1 From 56ff0557a2df87d243eb4d940d9f600fda8ef678 Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 22:37:13 +0300 Subject: [PATCH 12/27] Update main.yml --- .github/workflows/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6f3bf6754d..f8a4fb005f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,5 +33,8 @@ jobs: - name: Trigger Jenkins Job uses: sbitio/trigger-jenkins-job@master with: - user: ${{ secrets.JUSER }} - token: ${{ secrets.UTOKEN }} + JENKINS_USER: ${{ secrets.JUSER }} + JENKINS_TOKEN: ${{ secrets.UTOKEN }} + JENKINS_HOST: ${{ env.JENKINS_HOST }} + JENKINS_JOB: ${{ env.JENKINS_JOB }} + JENKINS_PARAMS: ${{ env.JENKINS_PARAMS }} From f5ad154a8903b56a30328a8f2692aa96fae59e8c Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 22:38:40 +0300 Subject: [PATCH 13/27] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f8a4fb005f..9262657ed5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,7 +21,7 @@ on: push env: - JENKINS_HOST: http://139.162.253.204:8080/ ## jenkins base url + JENKINS_HOST: http://139.162.253.204:8080 ## jenkins base url JENKINS_JOB: job/EndCourseProject ## builds the HelloWorld job inside testJobs JENKINS_PARAMS: no From f22bf558918bcfc5d39603e816bfb0b3432f89d9 Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 22:56:54 +0300 Subject: [PATCH 14/27] Update main.yml --- .github/workflows/main.yml | 47 ++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9262657ed5..deb1622eee 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,23 +18,40 @@ -on: push +# on: push -env: - JENKINS_HOST: http://139.162.253.204:8080 ## jenkins base url - JENKINS_JOB: job/EndCourseProject ## builds the HelloWorld job inside testJobs - JENKINS_PARAMS: no +# env: +# JENKINS_HOST: http://139.162.253.204:8080 ## jenkins base url +# JENKINS_JOB: job/EndCourseProject ## builds the HelloWorld job inside testJobs +# JENKINS_PARAMS: no + +# jobs: +# launch_jenkins_job: +# name: trigger jenkins job +# runs-on: ubuntu-latest +# steps: +# - name: Trigger Jenkins Job +# uses: sbitio/trigger-jenkins-job@master +# with: +# JENKINS_USER: ${{ secrets.JUSER }} +# JENKINS_TOKEN: ${{ secrets.UTOKEN }} +# JENKINS_HOST: ${{ env.JENKINS_HOST }} +# JENKINS_JOB: ${{ env.JENKINS_JOB }} +# JENKINS_PARAMS: ${{ env.JENKINS_PARAMS }} + + + +name: Trigger Jenkins Pipeline + +on: + push: + branches: + - main jobs: - launch_jenkins_job: - name: trigger jenkins job + trigger-jenkins: runs-on: ubuntu-latest steps: - - name: Trigger Jenkins Job - uses: sbitio/trigger-jenkins-job@master - with: - JENKINS_USER: ${{ secrets.JUSER }} - JENKINS_TOKEN: ${{ secrets.UTOKEN }} - JENKINS_HOST: ${{ env.JENKINS_HOST }} - JENKINS_JOB: ${{ env.JENKINS_JOB }} - JENKINS_PARAMS: ${{ env.JENKINS_PARAMS }} + - name: Trigger Jenkins + run: curl -X POST "http://139.162.253.204:8080/job/EndCourseProject/build" \ + --user ${{ secrets.JUSER }}:${{ secrets.UTOKEN }} From 358d1139a938473bacb39f9a8aa33465e4439f2a Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 23:00:08 +0300 Subject: [PATCH 15/27] Update main.yml --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index deb1622eee..cc94273e0e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -53,5 +53,4 @@ jobs: runs-on: ubuntu-latest steps: - name: Trigger Jenkins - run: curl -X POST "http://139.162.253.204:8080/job/EndCourseProject/build" \ - --user ${{ secrets.JUSER }}:${{ secrets.UTOKEN }} + run: curl -X POST "http://139.162.253.204:8080/job/EndCourseProject/build" --user ${{ secrets.JUSER }}:${{ secrets.UTOKEN }} From 8fe57674383c0c3e76376285722341289e3b7708 Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 23:07:58 +0300 Subject: [PATCH 16/27] Update main.yml --- .github/workflows/main.yml | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cc94273e0e..00e62186d6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,16 +41,37 @@ -name: Trigger Jenkins Pipeline +# name: Trigger Jenkins Pipeline + +# on: +# push: +# branches: +# - main + +# jobs: +# trigger-jenkins: +# runs-on: ubuntu-latest +# steps: +# - name: Trigger Jenkins +# run: curl -X POST "http://139.162.253.204:8080/job/EndCourseProject/build" --user ${{ secrets.JUSER }}:${{ secrets.UTOKEN }} + + +name: Trigger Jenkins Job on: push: branches: - - main + - main # Change this to the branch you want to trigger the action on jobs: trigger-jenkins: runs-on: ubuntu-latest + steps: - - name: Trigger Jenkins - run: curl -X POST "http://139.162.253.204:8080/job/EndCourseProject/build" --user ${{ secrets.JUSER }}:${{ secrets.UTOKEN }} + - name: Trigger Jenkins Job + run: | + curl -X POST "http://139.162.253.204:8080/job/EndCourseProject/build" \ + --user "${{ secrets.JUSER }}:${{ secrets.UTOKEN }}" \ + --data-urlencode "BRANCH=main" \ + --data-urlencode "DEPLOY_ENV=staging" \ + --data-urlencode "RUN_TESTS=true" From 05fdd8af4f11e68613519566ddf1b379d2a3f63a Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 23:12:46 +0300 Subject: [PATCH 17/27] Update main.yml --- .github/workflows/main.yml | 50 +++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 00e62186d6..30854ab48d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,22 +56,48 @@ # run: curl -X POST "http://139.162.253.204:8080/job/EndCourseProject/build" --user ${{ secrets.JUSER }}:${{ secrets.UTOKEN }} -name: Trigger Jenkins Job +# name: Trigger Jenkins Job +# on: +# push: +# branches: +# - main # Change this to the branch you want to trigger the action on + +# jobs: +# trigger-jenkins: +# runs-on: ubuntu-latest + +# steps: +# - name: Trigger Jenkins Job +# run: | +# curl -X POST "http://139.162.253.204:8080/job/EndCourseProject/build" \ +# --user "${{ secrets.JUSER }}:${{ secrets.UTOKEN }}" \ +# --data-urlencode "BRANCH=main" \ +# --data-urlencode "DEPLOY_ENV=staging" \ +# --data-urlencode "RUN_TESTS=true" + + +name: jenkins-CI + +# Controls when the workflow will run on: + # Triggers the workflow on push or pull request events but only for the main branch push: - branches: - - main # Change this to the branch you want to trigger the action on + branches: [ main ] + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - trigger-jenkins: + # This workflow contains a single job called "build" + build: + name: Build runs-on: ubuntu-latest - steps: - - name: Trigger Jenkins Job - run: | - curl -X POST "http://139.162.253.204:8080/job/EndCourseProject/build" \ - --user "${{ secrets.JUSER }}:${{ secrets.UTOKEN }}" \ - --data-urlencode "BRANCH=main" \ - --data-urlencode "DEPLOY_ENV=staging" \ - --data-urlencode "RUN_TESTS=true" + - name: Trigger jenkins job + uses: joshlk/jenkins-githubaction@master + with: + url: "http://139.162.253.204:8080" + job_name: job/EndCourseProject/build + username: ${{ secrets.JUSER }} + api_token: ${{ secrets.UTOKEN }} + timeout: "1000" From 8a8b0e645ec6be62eff50cbdcf2cfa665f38dfc8 Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 23:17:28 +0300 Subject: [PATCH 18/27] Update main.yml --- .github/workflows/main.yml | 74 +++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 30854ab48d..b5ff90e356 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,21 +1,21 @@ -# name: Trigger Jenkins Pipeline +name: Trigger Jenkins Pipeline -# on: -# push: -# branches: -# - main - -# jobs: -# trigger-jenkins: -# runs-on: ubuntu-latest -# steps: -# - name: Trigger Jenkins -# uses: appleboy/jenkins-action@v1.2.0 -# with: -# url: "http://139.162.253.204:8080//" -# user: ${{ secrets.JUSER }} -# token: ${{ secrets.UTOKEN }} +on: + push: + branches: + - main +jobs: + trigger-jenkins: + runs-on: ubuntu-latest + steps: + - name: Trigger Jenkins + uses: appleboy/jenkins-action@master + with: + url: "http://139.162.253.204:8080/" + user: ${{ secrets.JUSER }} + token: ${{ secrets.UTOKEN }} + job: "EndCourseProject" # on: push @@ -77,27 +77,27 @@ # --data-urlencode "RUN_TESTS=true" -name: jenkins-CI +# name: jenkins-CI -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the main branch - push: - branches: [ main ] +# # Controls when the workflow will run +# on: +# # Triggers the workflow on push or pull request events but only for the main branch +# push: +# branches: [ main ] -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - name: Build - runs-on: ubuntu-latest - steps: - - name: Trigger jenkins job - uses: joshlk/jenkins-githubaction@master - with: - url: "http://139.162.253.204:8080" - job_name: job/EndCourseProject/build - username: ${{ secrets.JUSER }} - api_token: ${{ secrets.UTOKEN }} - timeout: "1000" +# # A workflow run is made up of one or more jobs that can run sequentially or in parallel +# jobs: +# # This workflow contains a single job called "build" +# build: +# name: Build +# runs-on: ubuntu-latest +# steps: +# - name: Trigger jenkins job +# uses: joshlk/jenkins-githubaction@master +# with: +# url: "http://139.162.253.204:8080" +# job_name: job/EndCourseProject/build +# username: ${{ secrets.JUSER }} +# api_token: ${{ secrets.UTOKEN }} +# timeout: "1000" From 85075c68b47e429e3bac3e0b4b64098808ee59ae Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 23:24:26 +0300 Subject: [PATCH 19/27] Update main.yml --- .github/workflows/main.yml | 40 ++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b5ff90e356..7b31f42661 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,21 +1,37 @@ name: Trigger Jenkins Pipeline -on: - push: - branches: - - main +# on: +# push: +# branches: +# - main + +# jobs: +# trigger-jenkins: +# runs-on: ubuntu-latest +# steps: +# - name: Trigger Jenkins +# uses: appleboy/jenkins-action@master +# with: +# url: "http://139.162.253.204:8080/" +# user: ${{ secrets.JUSER }} +# token: ${{ secrets.UTOKEN }} +# job: "EndCourseProject" + +on: push jobs: - trigger-jenkins: + launch_jenkins_job: + name: trigger jenkins job runs-on: ubuntu-latest steps: - - name: Trigger Jenkins - uses: appleboy/jenkins-action@master - with: - url: "http://139.162.253.204:8080/" - user: ${{ secrets.JUSER }} - token: ${{ secrets.UTOKEN }} - job: "EndCourseProject" + - + name: Trigger Jenkins Job + uses: sbitio/trigger-jenkins-job@master + with: + JENKINS_USER: ${{ secrets.JUSER }} + JENKINS_TOKEN: ${{ secrets.UTOKEN }} + JENKINS_HOST: "http://139.162.253.204:8080" + JENKINS_JOB: job/EndCourseProject/build # on: push From d3a4764ece08b5b0e90c4e5f31fde79bae738e2f Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 23:29:52 +0300 Subject: [PATCH 20/27] Update main.yml --- .github/workflows/main.yml | 48 +++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7b31f42661..1362f78df4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,5 +1,25 @@ name: Trigger Jenkins Pipeline +on: push + +env: + JENKINS_HOST: http://139.162.253.204:8080/ ## jenkins base url + JENKINS_JOB: job/EndCourseProject/build ## builds the HelloWorld job inside testJobs + JENKINS_PARAMS: no +jobs: + launch_jenkins_job: + name: trigger jenkins job + runs-on: ubuntu-latest + steps: + - + name: Trigger Jenkins Job + uses: sbitio/trigger-jenkins-job@master + with: + JENKINS_USER: ${{ secrets.JUSER }} + JENKINS_TOKEN: ${{ secrets.UTOKEN }} + JENKINS_HOST: ${{ env.JENKINS_HOST }} + JENKINS_JOB: ${{ env.JENKINS_JOB }} + JENKINS_PARAMS: ${{ env.JENKINS_PARAMS }} # on: # push: # branches: @@ -17,21 +37,21 @@ name: Trigger Jenkins Pipeline # token: ${{ secrets.UTOKEN }} # job: "EndCourseProject" -on: push +# on: push -jobs: - launch_jenkins_job: - name: trigger jenkins job - runs-on: ubuntu-latest - steps: - - - name: Trigger Jenkins Job - uses: sbitio/trigger-jenkins-job@master - with: - JENKINS_USER: ${{ secrets.JUSER }} - JENKINS_TOKEN: ${{ secrets.UTOKEN }} - JENKINS_HOST: "http://139.162.253.204:8080" - JENKINS_JOB: job/EndCourseProject/build +# jobs: +# launch_jenkins_job: +# name: trigger jenkins job +# runs-on: ubuntu-latest +# steps: +# - +# name: Trigger Jenkins Job +# uses: sbitio/trigger-jenkins-job@master +# with: +# JENKINS_USER: ${{ secrets.JUSER }} +# JENKINS_TOKEN: ${{ secrets.UTOKEN }} +# JENKINS_HOST: "http://139.162.253.204:8080" +# JENKINS_JOB: job/EndCourseProject/build # on: push From 07c053ed3dcb5c3d4f71d4707ec40831833259f8 Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 23:31:22 +0300 Subject: [PATCH 21/27] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1362f78df4..ddfb8e0805 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ on: push env: JENKINS_HOST: http://139.162.253.204:8080/ ## jenkins base url - JENKINS_JOB: job/EndCourseProject/build ## builds the HelloWorld job inside testJobs + JENKINS_JOB: job/EndCourseProject ## builds the HelloWorld job inside testJobs JENKINS_PARAMS: no jobs: From 9edf7d0e3f748dbfdfad1db475566334d854081a Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 23:33:37 +0300 Subject: [PATCH 22/27] Update main.yml --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ddfb8e0805..ad239db690 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,9 +2,9 @@ name: Trigger Jenkins Pipeline on: push env: - JENKINS_HOST: http://139.162.253.204:8080/ ## jenkins base url - JENKINS_JOB: job/EndCourseProject ## builds the HelloWorld job inside testJobs - JENKINS_PARAMS: no + JENKINS_HOSTS: http://139.162.253.204:8080/ ## jenkins base url + JENKINS_JOBS: job/EndCourseProject ## builds the HelloWorld job inside testJobs + JENKINS_PARAM: no jobs: launch_jenkins_job: @@ -17,9 +17,9 @@ jobs: with: JENKINS_USER: ${{ secrets.JUSER }} JENKINS_TOKEN: ${{ secrets.UTOKEN }} - JENKINS_HOST: ${{ env.JENKINS_HOST }} - JENKINS_JOB: ${{ env.JENKINS_JOB }} - JENKINS_PARAMS: ${{ env.JENKINS_PARAMS }} + JENKINS_HOST: ${{ env.JENKINS_HOSTS }} + JENKINS_JOB: ${{ env.JENKINS_JOBS }} + JENKINS_PARAMS: ${{ env.JENKINS_PARAM }} # on: # push: # branches: From cf3e854f80b4bb5a0c3a6526b46c412680186afc Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 23:35:22 +0300 Subject: [PATCH 23/27] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ad239db690..180952d545 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ on: push env: JENKINS_HOSTS: http://139.162.253.204:8080/ ## jenkins base url - JENKINS_JOBS: job/EndCourseProject ## builds the HelloWorld job inside testJobs + #JENKINS_JOBS: ## builds the HelloWorld job inside testJobs JENKINS_PARAM: no jobs: @@ -18,7 +18,7 @@ jobs: JENKINS_USER: ${{ secrets.JUSER }} JENKINS_TOKEN: ${{ secrets.UTOKEN }} JENKINS_HOST: ${{ env.JENKINS_HOSTS }} - JENKINS_JOB: ${{ env.JENKINS_JOBS }} + JENKINS_JOB: job/EndCourseProject JENKINS_PARAMS: ${{ env.JENKINS_PARAM }} # on: # push: From 9b402396513c73066af43f8c78c22fb40613636e Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 23:37:12 +0300 Subject: [PATCH 24/27] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 180952d545..b12674c7a4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: push env: JENKINS_HOSTS: http://139.162.253.204:8080/ ## jenkins base url #JENKINS_JOBS: ## builds the HelloWorld job inside testJobs - JENKINS_PARAM: no + #JENKINS_PARAM: no jobs: launch_jenkins_job: @@ -19,7 +19,7 @@ jobs: JENKINS_TOKEN: ${{ secrets.UTOKEN }} JENKINS_HOST: ${{ env.JENKINS_HOSTS }} JENKINS_JOB: job/EndCourseProject - JENKINS_PARAMS: ${{ env.JENKINS_PARAM }} + #JENKINS_PARAMS: ${{ env.JENKINS_PARAM }} # on: # push: # branches: From 2f3b3492d5ba84ee0509dc3dfce9d66d4d190d8c Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 23:40:59 +0300 Subject: [PATCH 25/27] Update main.yml --- .github/workflows/main.yml | 56 +++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 16 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b12674c7a4..4318afd16a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,25 +1,49 @@ -name: Trigger Jenkins Pipeline -on: push +name: jenkins-CI -env: - JENKINS_HOSTS: http://139.162.253.204:8080/ ## jenkins base url - #JENKINS_JOBS: ## builds the HelloWorld job inside testJobs - #JENKINS_PARAM: no +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the main branch + push: + branches: [ main ] +# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - launch_jenkins_job: - name: trigger jenkins job + # This workflow contains a single job called "build" + build: + name: Build runs-on: ubuntu-latest steps: - - - name: Trigger Jenkins Job - uses: sbitio/trigger-jenkins-job@master + - name: Trigger jenkins job + uses: joshlk/jenkins-githubaction@master with: - JENKINS_USER: ${{ secrets.JUSER }} - JENKINS_TOKEN: ${{ secrets.UTOKEN }} - JENKINS_HOST: ${{ env.JENKINS_HOSTS }} - JENKINS_JOB: job/EndCourseProject - #JENKINS_PARAMS: ${{ env.JENKINS_PARAM }} + url: http://139.162.253.204:8080 + job_name: EndCourseProject + username: ${{ secrets.JUSER }} + api_token: ${{ secrets.UTOKEN }} + timeout: "1000" + +# name: Trigger Jenkins Pipeline +# on: push + +# env: +# JENKINS_HOSTS: http://139.162.253.204:8080/ ## jenkins base url +# #JENKINS_JOBS: ## builds the HelloWorld job inside testJobs +# #JENKINS_PARAM: no + +# jobs: +# launch_jenkins_job: +# name: trigger jenkins job +# runs-on: ubuntu-latest +# steps: +# - +# name: Trigger Jenkins Job +# uses: sbitio/trigger-jenkins-job@master +# with: +# JENKINS_USER: ${{ secrets.JUSER }} +# JENKINS_TOKEN: ${{ secrets.UTOKEN }} +# JENKINS_HOST: ${{ env.JENKINS_HOSTS }} +# JENKINS_JOB: job/EndCourseProject +# #JENKINS_PARAMS: ${{ env.JENKINS_PARAM }} # on: # push: # branches: From dbb3a484317fc079a34fd5ba7a42c6379ebd236c Mon Sep 17 00:00:00 2001 From: ziadanex99 Date: Wed, 14 Aug 2024 23:44:06 +0300 Subject: [PATCH 26/27] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4318afd16a..3baa0194be 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,8 +18,8 @@ jobs: with: url: http://139.162.253.204:8080 job_name: EndCourseProject - username: ${{ secrets.JUSER }} - api_token: ${{ secrets.UTOKEN }} + username: ${{ secrets.UNAME }} + api_token: ${{ secrets.MYTOKEN }} timeout: "1000" # name: Trigger Jenkins Pipeline From d65974f668565c0534521ab9c0e36f965b902777 Mon Sep 17 00:00:00 2001 From: "imezra2014@gmail.com" Date: Wed, 14 Aug 2024 23:47:58 +0300 Subject: [PATCH 27/27] github invoke #8 --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 0fbf024ddb..14c7224144 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -31,7 +31,7 @@

Welcome to my End Course Project, where my World of Food awaits!

-

Where the grill is always hot, and the drinks are always cold!! IF YOU THIS THEN THE GITHUB ACTION INVOCATION WORKS

+

Where the grill is always hot, and the drinks are always cold!! IF YOU THIS THEN THE GITHUB ACTION INVOCATION WORKS, yes its working