diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml index e2e2634e88..9af6199136 100644 --- a/handlers/restart_services.yml +++ b/handlers/restart_services.yml @@ -42,9 +42,6 @@ - name: restart ip6tables action: service name=ip6tables state=restarted -- name: restart jenkins - action: service name=jenkins state=restarted - - name: restart libvirtd action: service name=libvirtd state=restarted diff --git a/inventory/group_vars/jenkins-slave b/inventory/group_vars/jenkins-slave deleted file mode 100644 index cceee80a94..0000000000 --- a/inventory/group_vars/jenkins-slave +++ /dev/null @@ -1,288 +0,0 @@ ---- -datacenter: cloud -freezes: false - -ansible_ifcfg_blacklist: true - -# Packages installed on all Jenkins slaves (Fedora, CentOS) -slave_packages_common: -- java-1.8.0-openjdk-devel -- vim -- subversion -- bzr -- git -- rpmlint -- rpmdevtools -- mercurial -- mock -- gcc -- gcc-c++ -- libjpeg-turbo-devel -- python-bugzilla -- python-pip -- python-virtualenv -- python-coverage -- pylint -- python-nose -- python-BeautifulSoup -- python-fedora -- python-pep8 -- python-psycopg2 -- postgresql-devel # Required to install python-psycopg2 w/in a venv -- docbook-style-xsl # Required by gimp-help-2 -- make # Required by gimp-help-2 -- automake # Required by gimp-help-2 -- libcurl-devel # Required by blockerbugs -- python-formencode # Required by javapackages-tools -- asciidoc # Required by javapackages-tools -- xmlto # Required by javapackages-tools -- pycairo-devel # Required by dogtail -- packagedb-cli # Required by FedoraReview -- xorg-x11-server-Xvfb # Required by fedora-rube -- libffi-devel # Required by bodhi/cffi/cryptography -- openssl-devel # Required by bodhi/cffi/cryptography -- redis # Required by copr -- createrepo_c # Required by bodhi2 -- python-straight-plugin -- pyflakes # Requested by user rholy (ticket #4175) -- koji # Required by koschei (ticket #4852) and pyrpkg (ticket #4838) -- rpm-python # Required by koschei (ticket #4852) -- libgit2-devel # Required by pagure -- osbs-client # Required by pyrpkg (ticket #4838) -- intltool # Required by fedora-comps (ticket #5307) -- fedpkg # Required by fedora-kickstarts (ticket #5406) -- sqlite-devel # Required by fedora-hubs (ticket #5425) -- python-virtualenvwrapper # Required by fedora-hubs (ticket #5425) -- swig # Required by fm-orchestrator (ticket #5517) -- python-tox # Required by resultsdb_conventions (ticket #5785) -- gcc-c++ # Required by libabigail (ticket 5797) -- libtool # Required by libabigail (ticket 5797) -- elfutils-devel # Required by libabigail (ticket 5797) -- libxml2-devel # Required by libabigail (ticket 5797) -- doxygen # Required by libabigail (ticket 5797) -- python-sphinx # Required by libabigail (ticket 5797) -- texinfo # Required by libabigail (ticket 5797) -- dos2unix # Required by libabigail (ticket 5797) -- dpkg # Required by libabigail (ticket 5797) -- python2-devel # Required by libabigail (ticket 5797) -- rpm-python # Required by libabigail (ticket 5797) -- python2-mock # Required by libabigail (ticket 5797) -- koji # Required by libabigail (ticket 5797) -- pyxdg # Required by libabigail (ticket 5797) -- python-unittest2 # Required by libabigail (ticket 5797) -- wget # Required by libabigail (ticket 5797) -- mailcap # Required by libabigail (ticket 5797) - -# Packages installed only on Fedora Jenkins slaves -slave_packages_fedora: -- python3 -- python-nose-cover3 -- python3-nose-cover3 -- glibc -- glibc-devel -- libstdc++ -- zlib-devel -- ncurses-devel -- libX11-devel -- libXrender -- libXrandr -- nspr-devel ## Requested by 389-ds-base -- nss-devel -- svrcore-devel -- openldap-devel -- libdb-devel -- cyrus-sasl-devel -- icu -- libicu-devel -- gcc-c++ -- net-snmp-devel -- lm_sensors-devel -- bzip2-devel -- zlib-devel -- openssl-devel -- tcp_wrappers -- pam-devel -- systemd-units -- policycoreutils-python -- openldap-clients -- perl-Mozilla-LDAP -- nss-tools -- cyrus-sasl-gssapi -- cyrus-sasl-md5 -- libdb-utils -- perl-Socket -- perl-NetAddr-IP -- pcre-devel ## End of request list for 389-ds-base -- maven # Required by xmvn https://fedorahosted.org/fedora-infrastructure/ticket/4054 -- gtk3-devel # Required by dogtail -- glib2-devel # Required by Cockpit -- libgudev1-devel -- json-glib-devel -- gobject-introspection-devel -- libudisks2-devel -- NetworkManager-glib-devel -- systemd-devel -- accountsservice-devel -- pam-devel -- autoconf -- libtool -- intltool -- jsl -- python-scss -- gtk-doc -- krb5-devel -- sshpass -- perl-Locale-PO -- perl-JSON -- glib-networking -- realmd -- udisks2 -- mdadm -- lvm2 -- sshpass # End requires for Cockpit -- tito # Requested by msrb for javapackages-tools and xmvn (ticket#4113) -- pyflakes # Requested by user rholy (ticket #4175) -- firefox # Required for rube -- python-devel # Required for mpi4py -- python3-devel # Required for mpi4py -- pwgen # Required for mpi4py -- openmpi-devel # Required for mpi4py -- mpich2-devel # Required for mpi4py -- pylint # Required by Ipsilon -- python-pep8 -- nodejs-less -- python-openid -- python-openid-teams -- python-openid-cla -- python-cherrypy -- m2crypto -- lasso-python -- python-sqlalchemy -- python-ldap -- python-pam -- python-fedora -- freeipa-python -- httpd -- mod_auth_mellon -- postgresql-server -- openssl -- mod_wsgi -- python-psycopg2 -- sssd -- libsss_simpleifp -- openldap-servers -- mod_auth_gssapi -- krb5-server -- socket_wrapper -- nss_wrapper -- krb5-workstation -- python-sssdconfig -- mod_ssl -- python-jwcrypto -- python-lesscpy # End requires for Ipsilon -- libxml2-python # Required by gimp-docs -- createrepo # Required by dnf -- dia # Required by javapackages-tools ticket #4279 -- python-hawkey # Required by koschei (ticket #4852) -- python-librepo # Required by koschei (ticket #4852) -- python3-pygit2 # Required by pagure -- nosync # for use in mock -- liberasurecode-devel # Required by pyeclib (ticket #5015) - No EPEL7 build -- python2-mock -- python-lxml -- mongodb-server -- ruby # For modularity (ticket 5379) -- ruby-devel -- ruby-irb -- ruby-libs -- rubygem-bigdecimal -- rubygem-bundler -- rubygem-io-console -- rubygem-json -- rubygem-net-http-persistent -- rubygem-psych -- rubygem-rdoc -- rubygem-rmagick -- rubygem-thor # Required by Fedora Budget (ticket 5679) -- rubygems -- rubypick -- python2-unittest2 -- python2-createrepo_c # Required by bodhi2 -- python2-pygit2 # Required by pagure -- iptables -- ledger # Required by Fedora Budget (ticket 5679) -- rubygem-asciidoctor # Required by Fedora Budget (ticket 5679) -- rubygem-builder # Required by Fedora Budget (ticket 5679) -- rubygem-coderay # Required by Fedora Budget (ticket 5679) -- rubygem-eventmachine # Required by Fedora Budget (ticket 5679) -- rubygem-ffi # Required by Fedora Budget (ticket 5679) -- rubygem-formatador # Required by Fedora Budget (ticket 5679) -- rubygem-git # Required by Fedora Budget (ticket 5679) -- rubygem-haml # Required by Fedora Budget (ticket 5679) -- rubygem-listen # Required by Fedora Budget (ticket 5679) -- rubygem-method_source # Required by Fedora Budget (ticket 5679) -- rubygem-multi_json # Required by Fedora Budget (ticket 5679) -- rubygem-nenv # Required by Fedora Budget (ticket 5679) -- rubygem-pry # Required by Fedora Budget (ticket 5679) -- rubygem-rake # Required by Fedora Budget (ticket 5679) -- rubygem-rb-inotify # Required by Fedora Budget (ticket 5679) -- rubygem-shellany # Required by Fedora Budget (ticket 5679) -- rubygem-slop # Required by Fedora Budget (ticket 5679) -- rubygem-tilt # Required by Fedora Budget (ticket 5679) -- doxygen # Required by gssproxy (ticket 5703) -- findutils # Required by gssproxy (ticket 5703) -- gettext-devel # Required by gssproxy (ticket 5703) -- keyutils-libs-devel # Required by gssproxy (ticket 5703) -- libini_config-devel # Required by gssproxy (ticket 5703) -- libselinux-devel # Required by gssproxy (ticket 5703) -- libverto-devel # Required by gssproxy (ticket 5703) -- libxml2 # Required by gssproxy (ticket 5703) -- libxslt # Required by gssproxy (ticket 5703) -- m4 # Required by gssproxy (ticket 5703) -- pkgconfig # Required by gssproxy (ticket 5703) -- popt-devel # Required by gssproxy (ticket 5703) -- krb5-server-ldap # Required by gssproxy (ticket 5703) -- valgrind # Required by gssproxy (ticket 5703) Required by libabigail (Ticket 5797) -- perl-Fedora-VSP # needed by 389 -- perl-generators # needed by 389 -- libevent-devel # needed by 389 -- libcmocka-devel # needed by 389 -- gperftools-devel # needed by 389 - -# Packages installed only on CentOS Jenkins slaves -slave_packages_centos: -# "setup" is just a placeholder value -- setup - -# Packages only installed on el7 slave -el7_only: -- python-webob1.4 # Required by bodhi2 -- python-pillow # Required by bodhi2 -- python-hawkey # Required by koschei (ticket #4852) -- python-librepo # Required by koschei (ticket #4852) -- nosync # for use in mock -- python-unittest2 -- python-createrepo_c # Required by bodhi2 -- python-pygit2 # Required by pagure -- python-celery # Required by pagure -- python-pygments-markdown-lexer # Required by fedora-hubs (ticket #5425) - -f25_only: -- python3-tox -- python26 -- python33 -- python34 -- python36 -- swig # required for coco - -f26_only: -- python2-koji # Needed for pyrpkg -- python3-koji # Needed for pyrpkg -- python26 -- python35 -- libmodulemd # Needed by modularity (mbs, odcs and more) -- python-gobject-base # ... likewise -- python3-gobject-base # ... likewise -- tox # ... likewise -- python2-solv # ... likewise -- python3-solv # ... likewise diff --git a/master.yml b/master.yml index cf63adc329..d594510dca 100644 --- a/master.yml +++ b/master.yml @@ -57,8 +57,6 @@ - import_playbook: /srv/web/infra/ansible/playbooks/groups/infinote.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/ipa.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/ipsilon.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/jenkins-master.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/jenkins-slave.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/kerneltest.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/keyserver.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/koji-hub.yml diff --git a/roles/apps-fp-o/files/apps.yaml b/roles/apps-fp-o/files/apps.yaml index 40f77f3d7e..5024dc71ee 100644 --- a/roles/apps-fp-o/files/apps.yaml +++ b/roles/apps-fp-o/files/apps.yaml @@ -746,14 +746,6 @@ children: engineering *should* be producing and 2) all of the artifacts taht release engineering *did* produce. The web interface isn't much to write home about, but the API is where it's at. - - name: Jenkins - data: - url: https://jenkins.fedorainfracloud.org - description: > - Our own continuous integration (CI) service! It works now and - you can use it.. we just don't yet give it the same kind of - guarantees that we give our other apps. Look forwards to us - promoting it soon.. - name: faitout data: url: http://faitout.fedorainfracloud.org/ diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index c0a410b318..f2613b2c65 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -286,7 +286,7 @@ - name: log everything to log01 except on mirrorlist, do not log local4 there. copy: src=rsyslog/rsyslog-log01 dest=/etc/rsyslog.d/rsyslog-log01.conf mode=0644 - when: not inventory_hostname.startswith(('mirrorlist','copr','jenkins')) + when: not inventory_hostname.startswith(('mirrorlist','copr')) tags: - rsyslogd - config diff --git a/roles/jenkins/master/files/config.xml b/roles/jenkins/master/files/config.xml deleted file mode 100644 index 7fb1aca29e..0000000000 --- a/roles/jenkins/master/files/config.xml +++ /dev/null @@ -1,146 +0,0 @@ - - - - 1.609.1 - 0 - EXCLUSIVE - true - - hudson.model.Hudson.Administer:sysadmin-jenkins - hudson.model.Hudson.ConfigureUpdateCenter:sysadmin-jenkins - hudson.model.Hudson.Read:anonymous - hudson.model.Hudson.Read:sysadmin-jenkins - hudson.model.Hudson.RunScripts:sysadmin-jenkins - hudson.model.Item.Read:anonymous - - - https://id.fedoraproject.org/ - - true - - ${ITEM_ROOTDIR}/workspace - ${ITEM_ROOTDIR}/builds - - false - - - - - - 5 - 0 - - - - All - false - false - - - - - modularity - Fedora Modularity efforts. - false - false - - - - fm-dnf-plugin - fm-infra-reports - fm-infra-sync-trello - fm-metadata-service - fm-modulemd - fm-modulemd-resolver - fm-orchestrator - fm-trello-taiga-sync - pungi-modularity - - - - - - - - - - - - false - - - - infrastructure - Various Fedora Infrastructure projects. - false - false - - - - anitya - blockerbugs - bodhi - copr - elections - fedocal - fedora-bootstrap - fedora-hubs - fedora-mobile - fedora-rube - fedora-tagger - koschei - koschei-it - koschei-rpm - nuancier - PackageDB2 - pagure - - - - - - - - - - - - false - - - - releng - Fedora release engineering - false - false - - - - compose-utils - fedora-comps - fedora-kickstarts - fedpkg - koji - nuancier - pungi - pyrpkg - - - - - - - - - - - - false - - - All - 0 - - - - diff --git a/roles/jenkins/master/files/credentials.xml b/roles/jenkins/master/files/credentials.xml deleted file mode 100644 index 5d1252cc1d..0000000000 --- a/roles/jenkins/master/files/credentials.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - GLOBAL - e8f7d993-acfb-42b0-a324-e4145361b9ea - - jenkins - u61E1OLpdFq+M67h8DwufA== - - /etc/jenkins/id_rsa - - - - - - \ No newline at end of file diff --git a/roles/jenkins/master/files/hudson.tasks.Mailer.xml b/roles/jenkins/master/files/hudson.tasks.Mailer.xml deleted file mode 100644 index 228f42536d..0000000000 --- a/roles/jenkins/master/files/hudson.tasks.Mailer.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - @fedoraproject.org - http://jenkins.fedorainfracloud.org/ - jenkins@fedoraproject.org - localhost - false - UTF-8 - diff --git a/roles/jenkins/master/files/jenkins-binary-plugins.repo b/roles/jenkins/master/files/jenkins-binary-plugins.repo deleted file mode 100644 index 143dd91fa6..0000000000 --- a/roles/jenkins/master/files/jenkins-binary-plugins.repo +++ /dev/null @@ -1,10 +0,0 @@ -[kevin-jenkins-binary-rpms] -name=Copr repo for jenkins-binary-rpms owned by kevin -baseurl=https://copr-be.cloud.fedoraproject.org/results/kevin/jenkins-binary-rpms/fedora-$releasever-$basearch/ -type=rpm-md -skip_if_unavailable=True -gpgcheck=1 -gpgkey=https://copr-be.cloud.fedoraproject.org/results/kevin/jenkins-binary-rpms/pubkey.gpg -repo_gpgcheck=0 -enabled=1 -enabled_metadata=1 \ No newline at end of file diff --git a/roles/jenkins/master/files/jenkins.conf b/roles/jenkins/master/files/jenkins.conf deleted file mode 100644 index c5706e8e17..0000000000 --- a/roles/jenkins/master/files/jenkins.conf +++ /dev/null @@ -1,120 +0,0 @@ -## Path: Development/Jenkins -## Description: Configuration for the Jenkins continuous build server -## Type: string -## Default: "@@HOME@@" -## ServiceRestart: jenkins -# -# Directory where Jenkins store its configuration and working -# files (checkouts, build reports, artifacts, ...). -# -JENKINS_HOME="/var/lib/jenkins" - -## Type: string -## Default: "/bin/bash" -## ServiceRestart: jenkins -# -# Shell used to initialize the Jenkins server's environment. -# Setting this option to the path of a shell executable allows -# initialization of the Jenkins server environment using -# standard shell startup scripts. -# Disabling this option causes the Jenkins server to be run -# with a minimal environment. -# -JENKINS_INIT_SHELL="/bin/bash" - -## Type: string -## Default: "" -## ServiceRestart: jenkins -# -# Java runtime to run Jenkins -# When left empty, the current system default JRE, as defined -# by update-alternatives(8), is used. -# -JENKINS_JAVA_HOME="" - -## Type: string -## Default: "jenkins" -## ServiceRestart: jenkins -# -# Unix user account that runs the Jenkins daemon -# Be careful when you change this, as you need to update -# permissions of $JENKINS_HOME and /var/log/jenkins. -# -JENKINS_USER="jenkins" - -## Type: integer(-20:20) -## Default: 0 -## ServiceRestart: jenkins -# -# The nice level at which the Jenkins server (and its build jobs) run. -# -JENKINS_NICE="0" - -## Type: string -## Default: "-Djava.awt.headless=true" -## ServiceRestart: jenkins -# -# Options to pass to java when running Jenkins. -# -JENKINS_JAVA_OPTIONS="-Djava.awt.headless=true" - -## Type: integer(0:65535) -## Default: 8080 -## ServiceRestart: jenkins -# -# Port Jenkins is listening on. -# Set to -1 to disable -# -JENKINS_PORT="8080" -JENKINS_LISTEN_ADDRESS="127.0.0.1" - -## Type: integer(0:65535) -## Default: 8009 -## ServiceRestart: jenkins -# -# Ajp13 Port Jenkins is listening on. -# Set to -1 to disable -# -JENKINS_AJP_PORT="8009" - -## Type: integer(1:9) -## Default: 5 -## ServiceRestart: jenkins -# -# Debug level for logs -- the higher the value, the more verbose. -# 5 is INFO. -# -JENKINS_DEBUG_LEVEL="5" - -## Type: yesno -## Default: no -## ServiceRestart: jenkins -# -# Whether to enable access logging or not. -# -JENKINS_ENABLE_ACCESS_LOG="no" - -## Type: integer -## Default: 100 -## ServiceRestart: jenkins -# -# Maximum number of HTTP worker threads. -# -JENKINS_HANDLER_MAX="100" - -## Type: integer -## Default: 20 -## ServiceRestart: jenkins -# -# Maximum number of idle HTTP worker threads. -# -JENKINS_HANDLER_IDLE="20" - -## Type: string -## Default: "" -## ServiceRestart: jenkins -# -# Pass arbitrary arguments to Jenkins. -# Full option list: java -jar jenkins.war --help -# -JENKINS_ARGS="" diff --git a/roles/jenkins/master/files/jenkins.logrotate b/roles/jenkins/master/files/jenkins.logrotate deleted file mode 100644 index 061f38b9d8..0000000000 --- a/roles/jenkins/master/files/jenkins.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/jenkins/jenkins.log { - rotate 7 - daily - compress - delaycompress - missingok - notifempty - copytruncate -} diff --git a/roles/jenkins/master/tasks/main.yml b/roles/jenkins/master/tasks/main.yml deleted file mode 100644 index edf446714c..0000000000 --- a/roles/jenkins/master/tasks/main.yml +++ /dev/null @@ -1,171 +0,0 @@ -- name: install jenkins-binary-plugins copr repo - copy: > - src="jenkins-binary-plugins.repo" - dest="/etc/yum.repos.d/" - tags: - - jenkins - - jenkins/master - - config - - packages - - yumrepos - -- name: install packages - dnf: name={{ item }} state=present - with_items: - - jenkins - - jenkins-openid-plugin - - git - # binary plugins from copr repo -# - jenkins-bazaar-plugin -# - jenkins-chucknorris-plugin - - jenkins-cobertura-plugin -# - jenkins-cvs-plugin - - jenkins-external-monitor-job-plugin - - jenkins-git-client-plugin - - jenkins-git-plugin -# - jenkins-instant-messaging-plugin -# - jenkins-ldap-plugin - - jenkins-maven-plugin-plugin -# - jenkins-mercurial-plugin - - jenkins-python-plugin - - jenkins-scm-api-plugin - - jenkins-ssh-agent-plugin - - jenkins-translation-plugin - - jenkins-violations-plugin - - jenkins-xunit-plugin - tags: - - jenkins - - jenkins/master - - packages - -- name: hotfix broken openid plugin - file: state=link src=/usr/share/java/cglib/cglib.jar dest=/usr/share/java/cglib.jar - notify: - - restart jenkins - tags: - - jenkins - - jenkins/master - - hotfix - -- name: mount jenkins persistent storage - mount: name=/var/lib/jenkins src='LABEL=jenkins' fstype=ext4 state=mounted - tags: - - jenkins - - jenkins/master - -- name: Install custom jenkins plugins (from ansible bigfiles) - copy: src="{{ bigfiles }}/jenkins/{{ item }}.hpi" dest=/var/lib/jenkins/plugins/{{ item }}.hpi - with_items: - - fedmsg - - description-setter - notify: - - restart jenkins - tags: - - jenkins - - jenkins/master - - config - -- name: install jenkins logrotate file - copy: > - src="jenkins.logrotate" - dest="/etc/logrotate.d/jenkins" - tags: - - jenkins - - jenkins/master - - config - -- name: set /var/log/jenkins to not be writable by jenkins group - file: path=/var/log/jenkins mode=0700 owner=jenkins - tags: - - jenkins - - jenkins/master - - config - -- name: install jenkins launcher config file - copy: > - src="jenkins.conf" - dest="/etc/sysconfig/jenkins" - notify: - - restart jenkins - tags: - - jenkins - - jenkins/master - - config - -- name: install jenkins master config files - copy: > - src="{{ item }}" - dest="/var/lib/jenkins/{{ item }}" - with_items: - - config.xml - - credentials.xml - - hudson.tasks.Mailer.xml - notify: - - restart jenkins - tags: - - jenkins - - jenkins/master - - config - -- name: create directories for jenkins slaves config files - file: > - path="/var/lib/jenkins/nodes/{{ item.name }}" - state=directory - with_items: "{{ slaves }}" - tags: - - jenkins - - jenkins/master - - config - -- name: install jenkins slaves config files - template: > - src="slave-config.xml.j2" - dest="/var/lib/jenkins/nodes/{{ item.name }}/config.xml" - with_items: "{{ slaves }}" - notify: - - restart jenkins - tags: - - jenkins - - jenkins/master - - config - -- name: install private ssh key - copy: src="{{ private }}/files/jenkins/ssh/jenkins_master" dest=/etc/jenkins/id_rsa mode=400 owner=jenkins group=jenkins - tags: - - jenkins - - jenkins/master - - config - -- name: enable jenkins service to start on boot - service: name=jenkins state=started enabled=true - tags: - - jenkins - - jenkins/master - - service - -- name: create /srv/web for website role to use - file: > - path="/srv/web" - state=directory - tags: - - jenkins - - jenkins/master - - config - -- name: install jenkins httpd config - template: > - src="jenkins-httpd.conf.j2" - dest="/etc/httpd/conf.d/jenkins-httpd.conf" - notify: - - restart apache - tags: - - jenkins - - jenkins/master - - config - -- name: set sebooleans so proxying works - seboolean: name=httpd_can_network_relay state=true persistent=true - tags: - - jenkins - - jenkins/master - - config diff --git a/roles/jenkins/master/templates/jenkins-httpd.conf.j2 b/roles/jenkins/master/templates/jenkins-httpd.conf.j2 deleted file mode 100644 index 9261e1ac50..0000000000 --- a/roles/jenkins/master/templates/jenkins-httpd.conf.j2 +++ /dev/null @@ -1,30 +0,0 @@ - - ServerName jenkins.fedorainfracloud.org - ServerAdmin webmaster@fedoraproject.org - TraceEnable Off - - RewriteEngine on - RewriteRule ^/\.well-known/(.*) /srv/web/acme-challenge/.well-known/$1 [L] - RewriteCond %{HTTPS} off - RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE] - - - - - ServerName jenkins.fedorainfracloud.org - ServerAdmin webmaster@fedoraproject.org - - SSLEngine on - SSLCertificateFile /etc/pki/tls/certs/jenkins.fedorainfracloud.org.cert - SSLCertificateKeyFile /etc/pki/tls/private/jenkins.fedorainfracloud.org.key - SSLCertificateChainFile /etc/pki/tls/certs/jenkins.fedorainfracloud.org.chain - SSLHonorCipherOrder On - - # https://fedorahosted.org/fedora-infrastructure/ticket/4101#comment:14 - # If you change the protocols or cipher suites, you should probably update - # modules/squid/files/squid.conf-el6 too, to keep it in sync. - SSLProtocol {{ ssl_protocols }} - SSLCipherSuite {{ ssl_ciphers }} - - Redirect / https://jenkins-fedora-infra.apps.ci.centos.org/ - diff --git a/roles/jenkins/master/templates/slave-config.xml.j2 b/roles/jenkins/master/templates/slave-config.xml.j2 deleted file mode 100644 index ec9254336f..0000000000 --- a/roles/jenkins/master/templates/slave-config.xml.j2 +++ /dev/null @@ -1,19 +0,0 @@ - - - {{ item.name }} - {{ item.description }} - /srv/jenkins - {{ item.capacity }} - NORMAL - - - {{ item.host }} - 22 - e8f7d993-acfb-42b0-a324-e4145361b9ea - 0 - 0 - - - - mizdebsk - diff --git a/roles/jenkins/slave/tasks/main.yml b/roles/jenkins/slave/tasks/main.yml deleted file mode 100644 index 927bb69ed6..0000000000 --- a/roles/jenkins/slave/tasks/main.yml +++ /dev/null @@ -1,110 +0,0 @@ -- name: install common slave packages (dnf) - dnf: name={{ item }} state=present - with_items: "{{ slave_packages_common }}" - when: ansible_distribution_major_version|int > 21 - tags: - - jenkins - - jenkins/slave - - packages - -- name: install common slave packages (yum) - package: name={{ item }} state=present - with_items: "{{ slave_packages_common }}" - when: ansible_distribution_major_version|int < 22 - tags: - - jenkins - - jenkins/slave - - packages - -- name: install distro-specific slave packages (fedora, dnf) - dnf: name={{ item }} state=present - with_items: "{{ slave_packages_fedora }}" - when: ansible_distribution_major_version|int > 21 - tags: - - jenkins - - jenkins/slave - - packages - -- name: install distro-specific slave packages (centos, yum) - package: name={{ item }} state=present - with_items: "{{ slave_packages_centos }}" - when: ansible_distribution_major_version|int < 8 - tags: - - jenkins - - jenkins/slave - - packages - -- name: install el7 specific slave packages - package: name={{ item }} state=present - with_items: "{{ el7_only }}" - when: ansible_distribution_major_version|int == 7 - tags: - - jenkins - - jenkins/slave - - packages - -- name: install f25 specific slave packages - dnf: name={{ item }} state=present - with_items: "{{ f25_only }}" - when: ansible_distribution_major_version|int == 25 - tags: - - jenkins - - jenkins/slave - - packages - -- name: install f26 specific slave packages - dnf: name={{ item }} state=present - with_items: "{{ f26_only }}" - when: ansible_distribution_major_version|int == 26 - tags: - - jenkins - - jenkins/slave - - packages - -- name: create jenkins user - user: name=jenkins state=present createhome=yes system=no groups=mock - tags: - - jenkins - - jenkins/slave - - config - -- name: add jenkins ssh public key to authorized keys - authorized_key: user=jenkins key="{{ item }}" - with_file: - - "{{ private }}/files/jenkins/ssh/jenkins_master.pub" - tags: - - jenkins - - jenkins/slave - - config - -# Haveged is not needed per se, but very useful for builds that require lots of entropy -# Hello, Ipsilon -- name: install haveged - dnf: name=haveged state=present - when: is_fedora is defined and ansible_distribution_major_version|int > 21 - tags: - - jenkins - - jenkins/slave - - packages - -- name: enable haveged service to start on boot - service: name=haveged state=started enabled=true - when: is_fedora is defined and ansible_distribution_major_version|int > 21 - tags: - - jenkins - - jenkins/slave - - service - -- name: create workspace directory - file: state=directory path=/srv/jenkins owner=jenkins group=jenkins - tags: - - jenkins - - jenkins/slave - - config - -- name: set /etc/hosts with local ip for loopback tests. - template: src=hosts dest=/etc/hosts owner=root group=root - tags: - - jenkins - - jenkins/slave - - config diff --git a/roles/jenkins/slave/templates/hosts b/roles/jenkins/slave/templates/hosts deleted file mode 100644 index ad45b2f759..0000000000 --- a/roles/jenkins/slave/templates/hosts +++ /dev/null @@ -1,4 +0,0 @@ -127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 -::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 - -{{ ansible_default_ipv4.address }} {{ inventory_hostname }}