[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: Correct spelling mistakes.
Mattia Rizzolo
gitlab at salsa.debian.org
Tue Jun 5 10:13:47 BST 2018
Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net
Commits:
19c40a8a by Edward Betts at 2018-06-05T09:18:01+01:00
Correct spelling mistakes.
- - - - -
a29edda5 by Mattia Rizzolo at 2018-06-05T11:13:17+02:00
Merge branch 'spelling' of salsa.debian.org:edward/jenkins.debian.net
MR: https://salsa.debian.org/qa/jenkins.debian.net/merge_requests/4
- - - - -
10 changed files:
- CONTRIBUTING
- INSTALL
- README
- README.infrastructure
- debian/control
- deploy_jdn
- init_node
- job-cfg/chroot-installation.yaml.py
- logparse/debian-pkg-ci.rules
- update_jdn.sh
Changes:
=====================================
CONTRIBUTING
=====================================
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -1,7 +1,7 @@
== disclaimer
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!
=== Contributing code to this project
@@ -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].
Patches can be submitted as requests to pull from a publicly-visible
-git repository (this is the prefered way) communicated via IRC or mail,
-or completly via mail (using git format-patch, see below).
+git repository (this is the preferred way) communicated via IRC or mail,
+or completely via mail (using git format-patch, see below).
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 at lists.alioth.debian.org[development list],
=====================================
INSTALL
=====================================
--- a/INSTALL
+++ b/INSTALL
@@ -175,7 +175,7 @@ Get a recent copy of the database from:
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
=====================================
README
=====================================
--- a/README
+++ b/README
@@ -109,7 +109,7 @@ Installation tests inside chroot environments.
*** tests apt installation of a metapackage in a specific distro.
* '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
-** 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
=====================================
README.infrastructure
=====================================
--- a/README.infrastructure
+++ b/README.infrastructure
@@ -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 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
- # 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
# ccl means powercycling…
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Description: Stuff to setup a jenkins.debian.net instance
Scripts and configuration files for running jenkins.debian.net, including
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.
Package: jenkins.debian.net-bin
=====================================
deploy_jdn
=====================================
--- a/deploy_jdn
+++ b/deploy_jdn
@@ -11,7 +11,7 @@
# disclaimers:
# 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.
# the HOSTS lists below is yet another code duplication…
=====================================
init_node
=====================================
--- a/init_node
+++ b/init_node
@@ -51,7 +51,7 @@ echo "$(date -u) - total duration: ${HOUR}h ${MIN}m ${SEC}s."
echo
echo "#### NOTE #### (Those sudo problems are normal, see below! #### NOTE ####"
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 " cd ~jenkins-adm/jenkins.debian.net/"
echo " ./update_jdn.sh 2>&1 | sudo tee -a /var/log/jenkins/update_jdn.log"
=====================================
job-cfg/chroot-installation.yaml.py
=====================================
--- a/job-cfg/chroot-installation.yaml.py
+++ b/job-cfg/chroot-installation.yaml.py
@@ -103,7 +103,7 @@ all_targets = [
# not all packages are available in all distros
#
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'):
return False
# education-thin-client-server is obsolete since stretch…
@@ -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
-# 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
#
=====================================
logparse/debian-pkg-ci.rules
=====================================
--- a/logparse/debian-pkg-ci.rules
+++ b/logparse/debian-pkg-ci.rules
@@ -36,7 +36,7 @@ ok /HEAD is now at .+/
# catch lintian warnings and errors
warning /^W: /
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+/
# list of warnings here...
=====================================
update_jdn.sh
=====================================
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -16,7 +16,7 @@
# (interacting with the DSA machine setup which is in puppet…),
# thus obsoleting this script gradually, though this is used on
# 47 hosts currently (of which quite some were initially installed
-# manully…)
+# manually…)
#
# so, yes, patches welcome. saying this is crap alone is not helpful,
# nor is just suggesting some new or old technology. patches most welcome!
@@ -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
# 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['holger','*']="$sudo_groups"
@@ -454,7 +454,7 @@ if [ -f /etc/debian_version ] ; then
fi
$UP2DATE || sudo apt-get update
$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
case $HOSTNAME in
codethink*) $UP2DATE || sudo apt-get install -t jessie-backports pbuilder
@@ -615,7 +615,7 @@ if [ "$HOSTNAME" = "jenkins" ] ; then
git log | grep ^Author| cut -d " " -f2-|sort -u -f > $TMPFILE
echo "----" >> $TMPFILE
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 at ens-lyon.org" -e Lunar -e "j.schauer at email.de" -e "mattia at mapreri.org" -e "phil at jenkins-test-vm" $TMPFILE | sudo tee -a /var/lib/jenkins/userContent/THANKS > /dev/null
rm $TMPFILE
TMPDIR=$(mktemp -d -t update-jdn-XXXXXXXX)
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/66557fd8a2bd5638a40798ab4a5a6b365f9c3439...a29edda5eef8d95f40b265431572b5c78bd3288c
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/66557fd8a2bd5638a40798ab4a5a6b365f9c3439...a29edda5eef8d95f40b265431572b5c78bd3288c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20180605/a54eb2ef/attachment-0001.html>
More information about the Qa-jenkins-scm
mailing list