Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beat #125

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open

Beat #125

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
ec23ec7
new
skibum77 Nov 20, 2023
6fa5087
test modification
skibum77 Nov 20, 2023
19a406c
Merge branch 'master' of https://github.com/skibum77/LFS261-example-v…
skibum77 Nov 20, 2023
1344588
view mofi
skibum77 Nov 20, 2023
b088fcc
testfile attached
skibum77 Nov 20, 2023
ce4a354
estend readme file
skibum77 Nov 20, 2023
12f07a9
new build message
skibum77 Nov 20, 2023
9bf35a9
test
skibum77 Nov 21, 2023
8a9e7b8
test2
skibum77 Nov 21, 2023
0dc8add
new
skibum77 Nov 21, 2023
d98c895
test2 Beat Branch
skibum77 Nov 21, 2023
b67e499
Merge pull request #2 from skibum77/beat
skibum77 Nov 21, 2023
7118876
jenkinsfile added
skibum77 Nov 21, 2023
1d58dea
Merge pull request #3 from skibum77/beat
skibum77 Nov 21, 2023
aa3d93d
add more steps in jenkins file
skibum77 Nov 21, 2023
4db8e97
Merge pull request #4 from skibum77/beat
skibum77 Nov 21, 2023
f0a9019
new step branch beat
skibum77 Nov 21, 2023
a035873
Merge pull request #5 from skibum77/beat
skibum77 Nov 21, 2023
0b77b44
new
skibum77 Nov 27, 2023
11f3047
Merge branch 'master' into beat
skibum77 Nov 27, 2023
9ebaa60
Merge remote-tracking branch 'origin/beat'
skibum77 Nov 27, 2023
b2e9f74
changeset
skibum77 Nov 27, 2023
77b267d
Merge remote-tracking branch 'origin/master' into beat
skibum77 Nov 27, 2023
cf31faa
added Jenkinsfile for worker with build job
skibum77 Nov 28, 2023
5aa3697
added Test and package job for worker pipeline
skibum77 Nov 28, 2023
bbe4d03
archive artifacts, skip test and package
skibum77 Nov 28, 2023
5c408f7
un package step only on master, run stages only when
skibum77 Nov 28, 2023
c647d39
Merge pull request #6 from skibum77/feature/workerpipe
skibum77 Nov 28, 2023
215453d
add readme
skibum77 Nov 28, 2023
faea04f
Merge branch 'master' of https://github.com/skibum77/LFS261-example-v…
skibum77 Nov 28, 2023
22f18d4
adding dockerfile
skibum77 Jan 7, 2024
7d327a5
new jenkins file
skibum77 Jan 7, 2024
447788b
per stage agents, conditional execution
skibum77 Jan 7, 2024
361d061
docker hub credentials update incl dockerhub id
skibum77 Jan 7, 2024
9806f5c
Dockerfile for result app
skibum77 Jan 8, 2024
19ba35a
Dockerfile vote app
skibum77 Jan 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,12 @@ Note
----

The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client.

## Worker Java App
* Build Status

[![Build
Status](http://34.65.144.166:8080/buildStatus/icon?job=instavote%2Fworker-test)](http://34.65.36.125:8080/job/instavote/job/worker-test/)

Test beat

2 changes: 1 addition & 1 deletion result/views/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html ng-app="catsvsdogs">
<head>
<meta charset="utf-8">
<title>Cats vs Dogs -- Result</title>
<title>Cats vs. Dogs -- Result</title>
<base href="/index.html">
<meta name = "viewport" content = "width=device-width, initial-scale = 1.0">
<meta name="keywords" content="docker-compose, docker, stack">
Expand Down
2 changes: 1 addition & 1 deletion vote/integration_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ docker-compose build
docker-compose up -d


echo "I: Launching Integration Test ..."
echo "I: Launching Integration Test ....."

docker-compose run --rm integration /test/test.sh

Expand Down
1 change: 1 addition & 0 deletions vote/tests/test.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
das ist ein test