Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Debian QA
jenkins.debian.net
Commits
dc8c16f1
Commit
dc8c16f1
authored
Feb 16, 2022
by
Jelmer Vernooij
Browse files
Actually propagate BUILD_URL, drop unused environment variables.
parent
48c7b262
Changes
3
Hide whitespace changes
Inline
Side-by-side
bin/janitor_worker.sh
View file @
dc8c16f1
...
@@ -6,11 +6,7 @@ docker run --rm --cap-add=SYS_ADMIN --privileged \
...
@@ -6,11 +6,7 @@ docker run --rm --cap-add=SYS_ADMIN --privileged \
--memory
=
20g
\
--memory
=
20g
\
-v
/srv/janitor:/srv/janitor
\
-v
/srv/janitor:/srv/janitor
\
-e
BUILD_URL
=
"
${
BUILD_URL
}
"
\
-e
BUILD_URL
=
"
${
BUILD_URL
}
"
\
-e
EXECUTOR_NUMBER
=
"
${
EXECUTOR_NUMBER
}
"
\
-e
BUILD_ID
=
"
${
BUILD_ID
}
"
\
-e
BUILD_NUMBER
=
"
${
BUILD_NUMBER
}
"
\
-e
NODE_NAME
=
"
${
NODE_NAME
}
"
\
-e
NODE_NAME
=
"
${
NODE_NAME
}
"
\
-e
JENKINS_URL
=
"
${
JENKINS_URL
}
"
\
registry.salsa.debian.org/jelmer/janitor.debian.net/worker
\
registry.salsa.debian.org/jelmer/janitor.debian.net/worker
\
--listen-address
=
0.0.0.0
\
--listen-address
=
0.0.0.0
\
--port
=
8080
\
--port
=
8080
\
...
...
bin/jenkins_master_wrapper.sh
View file @
dc8c16f1
...
@@ -38,6 +38,10 @@ case $JOB_NAME in
...
@@ -38,6 +38,10 @@ case $JOB_NAME in
# the BUILD_TAG and BUILD_URL are re-exported on the nodes then
# the BUILD_TAG and BUILD_URL are re-exported on the nodes then
PARAMS+
=(
"
$BUILD_TAG
"
"
$BUILD_URL
"
"
$@
"
)
PARAMS+
=(
"
$BUILD_TAG
"
"
$BUILD_URL
"
"
$@
"
)
;;
;;
janitor-worker
)
# the BUILD_URL is re-exported on the nodes then
PARAMS+
=(
"
$BUILD_URL
"
"
$NODE_NAME
"
"
$@
"
)
;;
cleanup_nodes
)
cleanup_nodes
)
# pseudo job used to cleanup nodes
# pseudo job used to cleanup nodes
PARAMS+
=(
"
$@
"
)
PARAMS+
=(
"
$@
"
)
...
...
bin/jenkins_node_wrapper.sh
View file @
dc8c16f1
...
@@ -86,7 +86,9 @@ elif [ "$1" = "reproducible_html_builtin-pho" ] ; then
...
@@ -86,7 +86,9 @@ elif [ "$1" = "reproducible_html_builtin-pho" ] ; then
elif
[
"
$1
"
=
"janitor-setup-worker"
]
;
then
elif
[
"
$1
"
=
"janitor-setup-worker"
]
;
then
shift
;
exec
/srv/jenkins/bin/janitor_setup_worker.sh
;
croak
"Exec failed"
;
shift
;
exec
/srv/jenkins/bin/janitor_setup_worker.sh
;
croak
"Exec failed"
;
elif
[
"
$1
"
=
"janitor-worker"
]
;
then
elif
[
"
$1
"
=
"janitor-worker"
]
;
then
shift
;
exec
/srv/jenkins/bin/janitor_worker.sh
;
croak
"Exec failed"
;
export
BUILD_URL
=
"
$2
"
export
NODE_NAME
=
"
$3
"
shift
3
;
exec
/srv/jenkins/bin/janitor_worker.sh
;
croak
"Exec failed"
;
elif
[
"
$1
"
=
"fakeroot-foreign-worker"
]
;
then
elif
[
"
$1
"
=
"fakeroot-foreign-worker"
]
;
then
shift
;
exec
/srv/jenkins/bin/fakeroot_foreign_worker.sh
;
croak
"Exec failed"
;
shift
;
exec
/srv/jenkins/bin/fakeroot_foreign_worker.sh
;
croak
"Exec failed"
;
elif
[
"
$1
"
=
"haskell-package-plan"
]
;
then
elif
[
"
$1
"
=
"haskell-package-plan"
]
;
then
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment