Skip to content

Commit e24ff71

Browse files
committed
revert: disable Jenkins post-commit triggers
1 parent b1a357b commit e24ff71

4 files changed

Lines changed: 2 additions & 58 deletions

File tree

‎Jenkinsfile‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,7 @@ pipeline {
77
timeout(time: 45, unit: 'MINUTES')
88
}
99

10-
parameters {
11-
choice(name: 'TRIGGER_SOURCE', choices: ['manual', 'post-commit'], description: 'Build origin')
12-
}
13-
1410
stages {
15-
stage('Trigger contract') {
16-
steps {
17-
script {
18-
if (!(params.TRIGGER_SOURCE in ['manual', 'post-commit'])) {
19-
error("unsupported trigger source: ${params.TRIGGER_SOURCE}")
20-
}
21-
}
22-
}
23-
}
2411
stage('Build') {
2512
steps { sh 'scripts/build.sh' }
2613
}

‎scripts/jenkins-local-job.sh‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,6 @@ cli() {
2323
fi
2424
}
2525

26-
install_post_commit_hook() {
27-
local hooks hook temporary
28-
hooks="$root/.git/hooks"
29-
hook="$hooks/post-commit"
30-
mkdir -p "$hooks"
31-
temporary="$(mktemp "$hooks/.post-commit.XXXXXX")"
32-
cat > "$temporary" <<'EOF'
33-
#!/usr/bin/env bash
34-
set -u
35-
root="$(git rev-parse --show-toplevel 2>/dev/null)" || exit 0
36-
[[ "$(git -C "$root" branch --show-current 2>/dev/null)" == "release-tooling" ]] || exit 0
37-
nohup "$root/scripts/jenkins-local-job.sh" trigger-hook >> "$root/.git/jenkins-post-commit.log" 2>&1 &
38-
EOF
39-
chmod 700 "$temporary"
40-
mv "$temporary" "$hook"
41-
}
42-
4326
case "${1:-}" in
4427
configure)
4528
mkdir -p "$(dirname "$cli")"
@@ -51,18 +34,14 @@ case "${1:-}" in
5134
else
5235
cli create-job "$job_name" < "$root/scripts/jenkins-local-job.xml"
5336
fi
54-
install_post_commit_hook
5537
echo "configured $job_name"
5638
;;
5739
inspect)
5840
test -r "$config" && rg -n '<triggers|pollSCM|release-tooling|file://' "$config"
5941
;;
6042
trigger)
61-
cli build "$job_name" -p TRIGGER_SOURCE=manual -s
43+
cli build "$job_name" -s
6244
echo "triggered $jenkins_url/job/$job_name/"
6345
;;
64-
trigger-hook)
65-
cli build "$job_name" -p TRIGGER_SOURCE=post-commit
66-
;;
67-
*) echo "usage: $0 configure|inspect|trigger|trigger-hook" >&2; exit 2 ;;
46+
*) echo "usage: $0 configure|inspect|trigger" >&2; exit 2 ;;
6847
esac

‎scripts/jenkins-local-job.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,6 @@
22
<flow-definition plugin="workflow-job">
33
<description>Script-triggered codebase-memory-cli release-tooling build and test.</description>
44
<properties>
5-
<hudson.model.ParametersDefinitionProperty>
6-
<parameterDefinitions>
7-
<hudson.model.StringParameterDefinition>
8-
<name>TRIGGER_SOURCE</name>
9-
<defaultValue>manual</defaultValue>
10-
<description>Build origin; post-commit hooks use post-commit.</description>
11-
<trim>true</trim>
12-
</hudson.model.StringParameterDefinition>
13-
</parameterDefinitions>
14-
</hudson.model.ParametersDefinitionProperty>
155
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty>
166
<abortPrevious>false</abortPrevious>
177
</org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty>

‎tests/test_jenkins_artifact_contract.sh‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ set -euo pipefail
33

44
root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
55
pipeline="$root/Jenkinsfile"
6-
job_script="$root/scripts/jenkins-local-job.sh"
76

87
for required in \
98
"Archive Linux CLI artifact" \
@@ -16,14 +15,3 @@ for required in \
1615
exit 1
1716
}
1817
done
19-
20-
for required in "TRIGGER_SOURCE" "post-commit"; do
21-
grep -Fq "$required" "$pipeline" || {
22-
echo "missing Jenkins trigger contract: $required" >&2
23-
exit 1
24-
}
25-
grep -Fq "$required" "$job_script" || {
26-
echo "missing post-commit hook contract: $required" >&2
27-
exit 1
28-
}
29-
done

0 commit comments

Comments
 (0)