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

Add Jenkins continuous integration to FreeRADIUS for v3.0.x #2620

Merged
merged 2 commits into from May 1, 2019
Merged

Add Jenkins continuous integration to FreeRADIUS for v3.0.x #2620

merged 2 commits into from May 1, 2019

Conversation

mattrose
Copy link
Contributor

No description provided.

scripts/jenkins/Jenkinsfile Show resolved Hide resolved
sh 'for file in $(grep "^Source...:" redhat/freeradius.spec | cut -d" " -f2) ; do cp redhat/$file rpmbuild/SOURCES/$file ; done'
sh 'rpmbuild --define "_topdir $(pwd)/rpmbuild" -bb redhat/freeradius.spec'
} else {
sh "make deb"
Copy link
Member

Choose a reason for hiding this comment

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

It could be good to include an extra check for Debian base then an error message for unknown OS.

...
if (platform.contains("centos") || platform.contains("redhat")) {
   sh "yum-builddep -C --assumeyes redhat/freeradius.spec"
   sh "make rpm"
else if (platform.contains("debian") || platform.contains("ubuntu") ) {
   sh "make deb"
} else {
   sh "echo 'Unknown OS'; exit 1;"
}
...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That is not a bad idea. Maybe I'll do another PR with that.

#

# Use LTB's openldap packages intead of the distribution version to avoid linking against NSS
RUN echo $'[ltb-project]\n\
Copy link
Member

Choose a reason for hiding this comment

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

That file creation could be changed to provide that file into the filesystem and just use the command COPY

e.g:

COPY ltb-project.repo /etc/yum.repos.d/ltb-project.repo

ps: you should create that file into the same Dockerfile path.

#

# Use LTB's openldap packages intead of the distribution version to avoid linking against NSS
RUN echo $'[ltb-project]\n\
Copy link
Member

Choose a reason for hiding this comment

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

Can just reuse the previous idea about provide/reuse the file from the filesystem.

@alandekok alandekok merged commit 9756972 into FreeRADIUS:v3.0.x May 1, 2019
@mattrose mattrose deleted the pipelines-v3-pr branch May 27, 2019 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants