Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ updates:
directory: "./dockerfiles/agent-discovery"
schedule:
interval: weekly
open-pull-requests-limit: 10
open-pull-requests-limit: 10
- package-ecosystem: docker
directory: "./dockerfiles/android"
schedule:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/github-docker-registry-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ jobs:
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ env.GHCR_USERNAME }}
password: ${{ env.GHCR_TOKEN }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract branch name
# This step extracts the branch name
Expand Down
14 changes: 7 additions & 7 deletions dockerfiles/agent-discovery/find-name.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,16 @@ while true; do
sleep 2 # Wait for 5 seconds before the next iteration of the loop.
done

# Check if jenkins_controller is reachable, otherwise fall back to multi_jenkins_controller
## Check if jenkins_controller is reachable, otherwise fall back to multi_jenkins_controller
JENKINS_CONTROLLER="jenkins_controller"
if ! curl -s -f "http://${JENKINS_CONTROLLER}:8080/login" > /dev/null; then
if ! curl -s -f --max-time 60 "http://${JENKINS_CONTROLLER}:8080/login" > /dev/null; then
echo "Primary controller not reachable, falling back to multi controller..."
JENKINS_CONTROLLER="multi_jenkins_controller"
if ! curl -s -f "http://${JENKINS_CONTROLLER}:8080/login" > /dev/null; then
echo "Error: Neither primary nor multi controller is reachable"
exit 1
JENKINS_CONTROLLER="multi_jenkins_controller"
if ! curl -s -f --max-time 60 "http://${JENKINS_CONTROLLER}:8080/login" > /dev/null; then
echo "Error: Neither primary nor multi controller is reachable"
exit 1
fi
fi
fi

# Check If Jenkins is running or not
# If the message is found, awk exits with a non-zero status (1), and the loop continues.
Expand Down
Loading