Commit 19c40a8a authored by Edward Betts's avatar Edward Betts
Browse files

Correct spelling mistakes.

parent 66557fd8
== disclaimer == disclaimer
We are happy to take *untested* patches. Patches are reviewed before merging We are happy to take *untested* patches. Patches are reviewed before merging
but noone has a complete test environment for all jobs, so please publish but no one has a complete test environment for all jobs, so please publish
your well meant and untested patches as soon as they are ready! your well meant and untested patches as soon as they are ready!
=== Contributing code to this project === Contributing code to this project
...@@ -15,8 +15,8 @@ is notified. ...@@ -15,8 +15,8 @@ is notified.
The code is available in the link:https://anonscm.debian.org/git/qa/jenkins.debian.net.git/tree/[jenkins.debian.net.git repository]. The code is available in the link:https://anonscm.debian.org/git/qa/jenkins.debian.net.git/tree/[jenkins.debian.net.git repository].
Patches can be submitted as requests to pull from a publicly-visible Patches can be submitted as requests to pull from a publicly-visible
git repository (this is the prefered way) communicated via IRC or mail, git repository (this is the preferred way) communicated via IRC or mail,
or completly via mail (using git format-patch, see below). or completely via mail (using git format-patch, see below).
If appropriate, please make a topic branch based on the 'master' branch. If appropriate, please make a topic branch based on the 'master' branch.
You can send patches or requests to the link:mailto:qa-jenkins-dev@lists.alioth.debian.org[development list], You can send patches or requests to the link:mailto:qa-jenkins-dev@lists.alioth.debian.org[development list],
......
...@@ -175,7 +175,7 @@ Get a recent copy of the database from: ...@@ -175,7 +175,7 @@ Get a recent copy of the database from:
wget https://tests.reproducible-builds.org/reproducible.sql.xz wget https://tests.reproducible-builds.org/reproducible.sql.xz
---- ----
The database is kept using PostgreSQL and initialised by runing /srv/jenkins/bin/reproducible_db_maintenance.py manually as the jenkins user. The database is kept using PostgreSQL and initialised by running /srv/jenkins/bin/reproducible_db_maintenance.py manually as the jenkins user.
==== Websites scripts ==== Websites scripts
......
...@@ -109,7 +109,7 @@ Installation tests inside chroot environments. ...@@ -109,7 +109,7 @@ Installation tests inside chroot environments.
*** tests apt installation of a metapackage in a specific distro. *** tests apt installation of a metapackage in a specific distro.
* 'edu-packages_$(distro)_$(src-package)': * 'edu-packages_$(distro)_$(src-package)':
** builds one of the six debian-edu packages ('debian-edu', 'debian-edu-config', 'debian-edu-install', 'debian-edu-doc', 'debian-edu-artwork', 'debian-edu-archive-keyring' on every push to it's git master branch ** builds one of the six debian-edu packages ('debian-edu', 'debian-edu-config', 'debian-edu-install', 'debian-edu-doc', 'debian-edu-artwork', 'debian-edu-archive-keyring' on every push to it's git master branch
** and whenever 'debian-edu-doc' is build, https://jenkins.debian.net/userContent/debian-edu-doc/ get's updated automatically afterwards too. ** and whenever 'debian-edu-doc' is build, https://jenkins.debian.net/userContent/debian-edu-doc/ gets updated automatically afterwards too.
=== qa.debian.org related jobs === qa.debian.org related jobs
......
...@@ -46,7 +46,7 @@ There'a script to trigger the power on/off/cycle if needed, from hbi1 on Vagrant ...@@ -46,7 +46,7 @@ There'a script to trigger the power on/off/cycle if needed, from hbi1 on Vagrant
# 256 38:e8:16:bb:13:d1:5b:28:39:85:73:11:f2:1f:29:81 /etc/ssh/ssh_host_ecdsa_key.pub (ECDSA) # 256 38:e8:16:bb:13:d1:5b:28:39:85:73:11:f2:1f:29:81 /etc/ssh/ssh_host_ecdsa_key.pub (ECDSA)
# 256 16:cc:1f:0e:39:80:37:64:f7:23:dc:18:3f:58:d3:52 /etc/ssh/ssh_host_ed25519_key.pub (ED25519) # 256 16:cc:1f:0e:39:80:37:64:f7:23:dc:18:3f:58:d3:52 /etc/ssh/ssh_host_ed25519_key.pub (ED25519)
# It's advertising an ipv6 address, but it's actually only ipv4 for the # It's advertising an ipv6 address, but it's actually only ipv4 for the
# forseeable future and I just need to fix DNS. # foreseeable future and I just need to fix DNS.
hbi1$ cd /srv/rb/ ; ./remote-power NAME on|off|ccl hbi1$ cd /srv/rb/ ; ./remote-power NAME on|off|ccl
# ccl means powercycling… # ccl means powercycling…
......
...@@ -18,7 +18,7 @@ Description: Stuff to setup a jenkins.debian.net instance ...@@ -18,7 +18,7 @@ Description: Stuff to setup a jenkins.debian.net instance
Scripts and configuration files for running jenkins.debian.net, including Scripts and configuration files for running jenkins.debian.net, including
the ability to turn any machine into jenkins.$localdomain. the ability to turn any machine into jenkins.$localdomain.
. .
On installation of the package no adminstrative changes will be made the On installation of the package no administrative changes will be made the
system. To do so, run jenkins.debian.net-setup as root. system. To do so, run jenkins.debian.net-setup as root.
Package: jenkins.debian.net-bin Package: jenkins.debian.net-bin
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# disclaimers: # disclaimers:
# this script grew over the years… # this script grew over the years…
# the code is horrible and was always ment to be a quick local hack and never to be published # the code is horrible and was always meant to be a quick local hack and never to be published
# use at your own risk. it might eat your cats. you have been warned. # use at your own risk. it might eat your cats. you have been warned.
# the HOSTS lists below is yet another code duplication… # the HOSTS lists below is yet another code duplication…
......
...@@ -51,7 +51,7 @@ echo "$(date -u) - total duration: ${HOUR}h ${MIN}m ${SEC}s." ...@@ -51,7 +51,7 @@ echo "$(date -u) - total duration: ${HOUR}h ${MIN}m ${SEC}s."
echo echo
echo "#### NOTE #### (Those sudo problems are normal, see below! #### NOTE ####" echo "#### NOTE #### (Those sudo problems are normal, see below! #### NOTE ####"
echo echo
echo "Now log out and log in again (to aquire new group memberships, so that above sudo" echo "Now log out and log in again (to acquire new group memberships, so that above sudo"
echo "problems are gone) and run:" echo "problems are gone) and run:"
echo " cd ~jenkins-adm/jenkins.debian.net/" echo " cd ~jenkins-adm/jenkins.debian.net/"
echo " ./update_jdn.sh 2>&1 | sudo tee -a /var/log/jenkins/update_jdn.log" echo " ./update_jdn.sh 2>&1 | sudo tee -a /var/log/jenkins/update_jdn.log"
...@@ -103,7 +103,7 @@ all_targets = [ ...@@ -103,7 +103,7 @@ all_targets = [
# not all packages are available in all distros # not all packages are available in all distros
# #
def is_target_in_distro(distro, target): def is_target_in_distro(distro, target):
# education-ltsp-server and education-roaming-workstation are only availble since stretch… # education-ltsp-server and education-roaming-workstation are only available since stretch…
if distro in ('jessie') and target in ('education-ltsp-server', 'education-roaming-workstation'): if distro in ('jessie') and target in ('education-ltsp-server', 'education-roaming-workstation'):
return False return False
# education-thin-client-server is obsolete since stretch… # education-thin-client-server is obsolete since stretch…
...@@ -221,7 +221,7 @@ def get_targets_in_distro(distro): ...@@ -221,7 +221,7 @@ def get_targets_in_distro(distro):
# #
# given a target, returns a list of ([dist], key) tuples, so we can handle the # given a target, returns a list of ([dist], key) tuples, so we can handle the
# edu packages having views that are distro dependant # edu packages having views that are distro dependent
# #
# this groups all the distros that have matching views # this groups all the distros that have matching views
# #
......
...@@ -36,7 +36,7 @@ ok /HEAD is now at .+/ ...@@ -36,7 +36,7 @@ ok /HEAD is now at .+/
# catch lintian warnings and errors # catch lintian warnings and errors
warning /^W: / warning /^W: /
warning /^E: / warning /^E: /
# but supress things like 'N: 1 tag overridden (1 warning)' # but suppress things like 'N: 1 tag overridden (1 warning)'
ok /N: \d+ tags? overridden \(\d+/ ok /N: \d+ tags? overridden \(\d+/
# list of warnings here... # list of warnings here...
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# (interacting with the DSA machine setup which is in puppet…), # (interacting with the DSA machine setup which is in puppet…),
# thus obsoleting this script gradually, though this is used on # thus obsoleting this script gradually, though this is used on
# 47 hosts currently (of which quite some were initially installed # 47 hosts currently (of which quite some were initially installed
# manully…) # manually…)
# #
# so, yes, patches welcome. saying this is crap alone is not helpful, # so, yes, patches welcome. saying this is crap alone is not helpful,
# nor is just suggesting some new or old technology. patches most welcome! # nor is just suggesting some new or old technology. patches most welcome!
...@@ -102,7 +102,7 @@ sudo_groups='jenkins,jenkins-adm,sudo,adm' ...@@ -102,7 +102,7 @@ sudo_groups='jenkins,jenkins-adm,sudo,adm'
# if there's a need for host groups, a case statement on $HOSTNAME here that sets $GROUPNAME, say, should do the trick # if there's a need for host groups, a case statement on $HOSTNAME here that sets $GROUPNAME, say, should do the trick
# then you can define user_host_groups['phil','lvm_group']=... below # then you can define user_host_groups['phil','lvm_group']=... below
# and add checks for the GROUP version whereever the HOSTNAME is checked in the following code # and add checks for the GROUP version wherever the HOSTNAME is checked in the following code
user_host_groups['helmut','*']="$sudo_groups" user_host_groups['helmut','*']="$sudo_groups"
user_host_groups['holger','*']="$sudo_groups" user_host_groups['holger','*']="$sudo_groups"
...@@ -454,7 +454,7 @@ if [ -f /etc/debian_version ] ; then ...@@ -454,7 +454,7 @@ if [ -f /etc/debian_version ] ; then
fi fi
$UP2DATE || sudo apt-get update $UP2DATE || sudo apt-get update
$UP2DATE || sudo apt-get install $DEBS $MASTERDEBS $UP2DATE || sudo apt-get install $DEBS $MASTERDEBS
# dont (re-)install pbuilder if it's on hold # don't (re-)install pbuilder if it's on hold
if [ "$(dpkg-query -W -f='${db:Status-Abbrev}\n' pbuilder)" != "hi " ] ; then if [ "$(dpkg-query -W -f='${db:Status-Abbrev}\n' pbuilder)" != "hi " ] ; then
case $HOSTNAME in case $HOSTNAME in
codethink*) $UP2DATE || sudo apt-get install -t jessie-backports pbuilder codethink*) $UP2DATE || sudo apt-get install -t jessie-backports pbuilder
...@@ -615,7 +615,7 @@ if [ "$HOSTNAME" = "jenkins" ] ; then ...@@ -615,7 +615,7 @@ if [ "$HOSTNAME" = "jenkins" ] ; then
git log | grep ^Author| cut -d " " -f2-|sort -u -f > $TMPFILE git log | grep ^Author| cut -d " " -f2-|sort -u -f > $TMPFILE
echo "----" >> $TMPFILE echo "----" >> $TMPFILE
sudo tee /var/lib/jenkins/userContent/THANKS > /dev/null < THANKS.head sudo tee /var/lib/jenkins/userContent/THANKS > /dev/null < THANKS.head
# samuel, lunar, josch and phil committed with several commiters, only display one # samuel, lunar, josch and phil committed with several committers, only display one
grep -v -e "samuel.thibault@ens-lyon.org" -e Lunar -e "j.schauer@email.de" -e "mattia@mapreri.org" -e "phil@jenkins-test-vm" $TMPFILE | sudo tee -a /var/lib/jenkins/userContent/THANKS > /dev/null grep -v -e "samuel.thibault@ens-lyon.org" -e Lunar -e "j.schauer@email.de" -e "mattia@mapreri.org" -e "phil@jenkins-test-vm" $TMPFILE | sudo tee -a /var/lib/jenkins/userContent/THANKS > /dev/null
rm $TMPFILE rm $TMPFILE
TMPDIR=$(mktemp -d -t update-jdn-XXXXXXXX) TMPDIR=$(mktemp -d -t update-jdn-XXXXXXXX)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment