Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev-util/jenkins-bin: GLEP 81 migration via bump #14121

Closed
wants to merge 4 commits into from

Conversation

Whissi
Copy link
Contributor

@Whissi Whissi commented Dec 25, 2019

When reviewing, please pay special attention to

-       fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+       fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR}/home ${JENKINS_DIR}/backup

I.e. I dropped $JENKINS_DIR because $JENKINS_DIR is HOME of acct-user/jenkins and acct-* stuff should take care of correct permissions.

Complete diff:

--- jenkins-bin-2.205.ebuild	2019-12-06 17:58:21.770595968 +0100
+++ jenkins-bin-2.210.ebuild	2019-12-25 15:48:41.598547876 +0100
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit user systemd
+inherit systemd
 
 DESCRIPTION="Extensible continuous integration server"
 HOMEPAGE="https://jenkins.io/"
@@ -14,7 +14,13 @@
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE=""
 
-RDEPEND="media-fonts/dejavu
+COMMON_DEPS="acct-user/jenkins
+	acct-group/jenkins"
+
+DEPEND="${COMMON_DEPS}"
+
+RDEPEND="${COMMON_DEPS}
+	media-fonts/dejavu
 	media-libs/freetype
 	!dev-util/jenkins-bin:lts
 	>=virtual/jre-1.8.0"
@@ -23,11 +29,6 @@
 
 JENKINS_DIR=/var/lib/jenkins
 
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
 src_install() {
 	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
 
@@ -42,5 +43,5 @@
 
 	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
 
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
 }

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@Whissi Whissi requested review from graaff and chutz and removed request for chutz December 25, 2019 14:56
@gentoo-bot
Copy link

Pull Request assignment

Submitter: @Whissi
Areas affected: ebuilds
Packages affected: acct-group/jenkins, acct-user/jenkins, dev-util/jenkins-bin

acct-group/jenkins: @gentoo/proxy-maint (new package)
acct-user/jenkins: @gentoo/proxy-maint (new package)
dev-util/jenkins-bin: patrick, @graaff

Linked bugs

No bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and request reassignment.

If you do not receive any reply to this pull request, please open or link a bug to attract the attention of maintainers.


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added new package The PR is adding a new package. assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Dec 25, 2019
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2019-12-25 16:00 UTC
Newest commit scanned: 4ccff2d
Status: ✅ good

Issues already there before the PR (double-check them):
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#app-emulation/virtualbox-additions
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#app-emulation/virtualbox-guest-additions
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#app-emulation/virtualbox-modules
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#app-forensics/sleuthkit
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#app-laptop/hdaps-gl
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#app-text/jabref-bin
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#dev-db/postgresql
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#dev-java/icedtea
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#dev-java/icedtea-web
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#dev-java/netbeans-platform
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#dev-python/parver
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#dev-ros/roslaunch
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#dev-util/cmt
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#dev-util/google-perftools
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#games-util/pogo-manager-bin
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#gnustep-apps/sogo
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#mail-filter/spamassassin
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#media-gfx/iscan
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#media-sound/podcatcher
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#media-tv/gentoo-vdr-scripts
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#net-analyzer/nagios-check_multiple
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#net-analyzer/nagios-plugins
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#net-analyzer/snort
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#net-analyzer/wireshark
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#net-analyzer/zabbix
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#net-dns/unbound
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#net-ftp/lftp
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#net-libs/nodejs
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#net-misc/gerbera
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#net-misc/icaclient
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#net-misc/kea
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#net-misc/youtube-dl
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#net-p2p/bisq
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#net-print/cups
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#net-vpn/strongswan
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#sci-libs/tensorflow
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#sci-libs/tensorflow-estimator
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#sci-mathematics/geogebra
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#sys-auth/nss-pam-ldapd
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#sys-cluster/crmsh
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#sys-cluster/kube-apiserver
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#sys-cluster/kube-controller-manager
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#sys-cluster/kube-scheduler
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#sys-cluster/neutron
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#virtual/cargo
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#virtual/jdk
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#virtual/jre
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#virtual/rust
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#www-apps/netbox
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#www-apps/postfixadmin
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#www-misc/shellinabox
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#www-servers/nginx
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#www-servers/varnish
https://qa-reports.gentoo.org/output/gentoo-ci/d0ad5db/output.html#x11-libs/fox

IUSE=""

COMMON_DEPS="acct-user/jenkins
acct-group/jenkins"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Group first :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, will fix that on merge.


DESCRIPTION="Jenkins program user"
ACCT_USER_ID=473
ACCT_USER_HOME=/var/lib/jenkins
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mjo suggested using the default home to avoid fighting for the home directory by various packages.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I don't understand. Which default home should be used instead? Package used

JENKINS_DIR=/var/lib/jenkins

pkg_setup() {
	enewgroup jenkins
	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
}

before and new acct-user/jenkins is mirroring this behavior. Not?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It means that the acct-user/group package will only define the uid/gid, but the home directory will be specified in the dev-util/jenkins package itself as before.

RESTRICT="mirror"
SLOT="lts"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE=""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please clean up this mess too:

DESCRIPTION="Extensible continuous integration server"
HOMEPAGE="https://jenkins.io/"
SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"

LICENSE="MIT"
SLOT="lts"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
RESTRICT="mirror"

(drop empty IUSE)

@Whissi
Copy link
Contributor Author

Whissi commented Mar 26, 2021

Closed via 031848a

@Whissi Whissi closed this Mar 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). new package The PR is adding a new package. no bug found No Bug/Closes found in the commits.
Projects
None yet
5 participants