diff --git a/ansible.cfg b/ansible.cfg index bc95d543a..5f8cf41ba 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -31,10 +31,6 @@ ansible_remote_tmp = /tmp [hosts:smartos] ansible_python_interpreter = /opt/local/bin/python -[hosts:freebsd] -ansible_python_interpreter = /usr/local/bin/python3 -ansible_shell_allow_world_readable_temp = True - [hosts:ibm] become_method = sudo diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 9f3fe3afe..a7240b965 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -100,8 +100,6 @@ hosts: fedora42-x64-2: {ip: 104.131.92.208} fedora43-x64-1: {ip: 165.227.191.35} fedora43-x64-2: {ip: 159.65.246.5} - freebsd13-x64-1: {ip: 138.197.25.49, user: freebsd, swap_file_size_mb: 2048} - freebsd13-x64-2: {ip: 159.89.188.229, user: freebsd, swap_file_size_mb: 2048} rhel8-x64-1: {ip: 161.35.139.78, build_test_v8: yes, swap_file_size_mb: 2048} rhel9-x64-1: {ip: 134.122.12.240, swap_file_size_mb: 2048} ubuntu2204_docker-x64-1: {ip: 134.209.55.216} diff --git a/ansible/roles/baselayout/tasks/main.yml b/ansible/roles/baselayout/tasks/main.yml index 08f1d558f..27d914ce6 100644 --- a/ansible/roles/baselayout/tasks/main.yml +++ b/ansible/roles/baselayout/tasks/main.yml @@ -121,16 +121,6 @@ - "{{ role_path }}/tasks/partials/postinstall/{{ os|stripversion }}.yml" skip: true -- name: remove fortune from login shells - when: os|stripversion == 'freebsd' - lineinfile: - dest: "/home/{{ server_user }}/{{ login_item }}" - state: absent - regexp: fortune freebsd - loop_control: - loop_var: login_item - with_items: [ '.login', '.profile' ] - - name: pi | set hostname when: "inventory_hostname|regex_search('-arm(v6l|v7l|64)_pi')" copy: diff --git a/ansible/roles/baselayout/tasks/partials/ntp/freebsd.yml b/ansible/roles/baselayout/tasks/partials/ntp/freebsd.yml deleted file mode 100644 index f66fffb5b..000000000 --- a/ansible/roles/baselayout/tasks/partials/ntp/freebsd.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- - -# -# enable/start the os-bundled ntpd -# - -- name: start ntpd - service: name=ntpd state=started enabled=yes diff --git a/ansible/roles/baselayout/tasks/partials/repo/freebsd.yml b/ansible/roles/baselayout/tasks/partials/repo/freebsd.yml deleted file mode 100644 index 99e9c976c..000000000 --- a/ansible/roles/baselayout/tasks/partials/repo/freebsd.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- - -# -# get regular instead of quarterly updates -# - -- name: "repo : switch from quarterly to latest" - lineinfile: - dest: /etc/pkg/FreeBSD.conf - regexp: '^(\s+)url\:' - state: present - line: ' url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest",' - -# if the schema definition is updated this is required for any following -# `pkg` commands to work -- name: "repo : update definition" - raw: pkg update -q - register: has_updated_package_repo diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index 01a6eaef9..e7c98d91c 100644 --- a/ansible/roles/baselayout/vars/main.yml +++ b/ansible/roles/baselayout/vars/main.yml @@ -69,10 +69,6 @@ packages: { 'bzip2,ccache,clang,gcc-c++,git,fontconfig,sudo,make,python3-pip,python3-setuptools,rust,cargo', ], - freebsd: [ - 'ccache,git,gmake,sudo,python3' - ], - 'macos10.15': [ 'cmake,python,ccache' ], diff --git a/ansible/roles/bootstrap/tasks/partials/freebsd.yml b/ansible/roles/bootstrap/tasks/partials/freebsd.yml deleted file mode 100644 index c0a51301c..000000000 --- a/ansible/roles/bootstrap/tasks/partials/freebsd.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- - -# -# FreeBSD -# - -# Assumes swap_file_size_mb has been set. -- name: create swapfile - ansible.builtin.command: - cmd: dd if=/dev/zero of=/{{ swap_file }} bs=1M count={{ swap_file_size_mb }} - creates: "{{ swap_file }}" - become: yes - become_user: root - register: swap_create - -- name: set swapfile permissions - ansible.builtin.file: - mode: 0600 - owner: root - path: "{{ swap_file }}" - -- name: set up swap area - ansible.builtin.command: - cmd: mdconfig -a -t vnode -f {{ swap_file }} -u 0 - when: swap_create.changed - -- name: enable swap - ansible.builtin.command: - cmd: swapon /dev/md0 - when: swap_create.changed - -- name: add swap to fstab - ansible.posix.mount: - fstype: swap - opts: "sw,file={{ swap_file }},late" - path: none - src: md0 - state: present - when: swap_create.changed diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index 071793131..54f6d9b7e 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -40,16 +40,6 @@ - "{{ packages[os|stripversion]|default('[]') }}" - "{{ common_packages|default('[]') }}" -- name: remove fortune from login shells - when: os|stripversion == 'freebsd' - lineinfile: - dest: "/home/{{ server_user }}/{{ login_item }}" - state: absent - regexp: fortune freebsd - loop_control: - loop_var: login_item - with_items: [ '.login', '.profile' ] - - name: set up ntp include_tasks: "{{ ntp_include }}" loop_control: diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml index 3ed5d6a29..2f060ed44 100644 --- a/ansible/roles/java-base/vars/main.yml +++ b/ansible/roles/java-base/vars/main.yml @@ -11,7 +11,6 @@ packages: { 'debian13': 'openjdk-25-jre-headless', 'fedora42': 'java-21-openjdk-headless', 'fedora43': 'java-25-openjdk-headless', - 'freebsd': 'openjdk17-jre', 'macos': 'temurin17', 'rhel8': 'java-21-openjdk-headless', 'rhel9': 'java-25-openjdk-headless', diff --git a/ansible/roles/jenkins-worker/tasks/partials/tap2junit/freebsd.yml b/ansible/roles/jenkins-worker/tasks/partials/tap2junit/freebsd.yml deleted file mode 100644 index dcc338ab5..000000000 --- a/ansible/roles/jenkins-worker/tasks/partials/tap2junit/freebsd.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -# -# freebsd13: python3.11 -# - -- name: install pip - package: - name: py311-pip - state: present - -- name: freebsd | update pip3 symlink - when: os == "freebsd13" - file: - dest: "/usr/local/bin/pip3" - state: link - src: "/usr/local/bin/pip-3.11" - -- name: install tap2junit - pip: - executable: pip3 - name: tap2junit=={{ tap2junit_version }} - state: present diff --git a/ansible/roles/jenkins-worker/templates/freebsd.initd.j2 b/ansible/roles/jenkins-worker/templates/freebsd.initd.j2 deleted file mode 100644 index e08c827ab..000000000 --- a/ansible/roles/jenkins-worker/templates/freebsd.initd.j2 +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh - -# -# PROVIDE: jenkins -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Configuration settings for jenkins in /etc/rc.conf: -# -# jenkins_enable (bool): -# Set to "NO" by default. -# Set it to "YES" to enable jenkins -# - -. /etc/rc.subr - -name="jenkins" -rcvar="jenkins_enable" - -load_rc_config ${name} - -: ${jenkins_enable:=NO} - -jenkins_env=" \ - HOME=/usr/home/{{ server_user }} \ - OSTYPE=freebsd \ - NODE_COMMON_PIPE=/home/{{ server_user }}/test.pipe \ - NODE_TEST_DIR=/home/{{ server_user }}/tmp \ - PATH=/usr/local/libexec/ccache:/usr/local/bin:${PATH} \ - JOBS={{ jobs_env|default('2') }} \ - CC=cc \ - CXX=c++" - -jenkins_jar="/home/{{ server_user }}/agent.jar" -jenkins_log_file="/home/{{ server_user }}/${name}_console.log" -jenkins_args="-Xmx{{ server_ram|default('128m') }} -jar ${jenkins_jar} \ - -url {{ jenkins_url }} -name {{ inventory_hostname }} \ - -secret {{ secret }}" -jenkins_user="{{ server_user }}" -jenkins_group="{{ server_user }}" - -# FreeBSD uses a java wrapper. Without full path pid monitoring won't work -procname=$(cat /usr/local/etc/javavms | cut -d "#" -f 1) -pidfile="/var/run/${name}/${name}.pid" -monitor_pidfile="/var/run/${name}/${name}_monitor.pid" - -required_files="${procname} ${jenkins_jar}" - -command="/usr/sbin/daemon" -command_args="-f -r -p ${pidfile} -P ${monitor_pidfile} -o ${jenkins_log_file} \ - ${procname} ${jenkins_args}" - -start_precmd="jenkins_prestart" -start_cmd="jenkins_start" -stop_cmd="jenkins_stop" - -jenkins_prestart() { - if [ ! -f "${jenkins_log_file}" ]; then - touch "${jenkins_log_file}" - chown "{{ server_user }}:{{ server_user }}" "${jenkins_log_file}" - chmod 640 "${jenkins_log_file}" - fi - if [ ! -d $(dirname ${pidfile}) ]; then - install -d -o "{{ server_user }}" -g "{{ server_user }}" \ - -m 755 $(dirname ${pidfile}) - fi -} - -# need to override _start since it doesn't seem to pass env in FreeBSD 11 -jenkins_start() { - echo "Starting service: ${name}." - su -l ${jenkins_user} -c "exec env ${jenkins_env} \ - ${command} ${command_args}" -} - -# Kill monitor, not java since it would respawn -jenkins_stop() { - if [ ! -f ${pidfile} -a ! -f ${monitor_pidfile} ]; then - echo "${name} isn't running." - else - echo -n "Stopping service: ${name}" - kill `cat ${monitor_pidfile}` - # files are removed on exit, but be extra sure - rm -f ${pidfile} ${monitor_pidfile} - echo . - fi -} - -run_rc_command "$1" diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml index 5cc8b8f19..12c82da18 100644 --- a/ansible/roles/jenkins-worker/vars/main.yml +++ b/ansible/roles/jenkins-worker/vars/main.yml @@ -6,7 +6,6 @@ init: { aix: ['aix72', 'aix73'], - freebsd: 'freebsd', ibmi: 'ibmi74', macos: 'macos', systemd: ['debian', 'fedora', 'rhel7', 'rhel8', 'rhel9', 'ubuntu'], @@ -25,11 +24,6 @@ jenkins_init: { src: 'sysvinit.initd.j2', mode: '0755' }, - freebsd: { - dest: '/usr/local/etc/rc.d/jenkins', - src: 'freebsd.initd.j2', - mode: '0755' - }, macos: { dest: '/Library/LaunchDaemons/org.nodejs.osx.jenkins.plist', src: 'org.nodejs.osx.jenkins.plist', @@ -73,7 +67,6 @@ java_path: { # same for bash. will default to /bin/bash if you don't set it bash_path: { aix: '/usr/bin/ksh', - freebsd: '/usr/local/bin/bash', zos: 'bash' } diff --git a/ansible/roles/package-upgrade/tasks/partials/pkgng.yml b/ansible/roles/package-upgrade/tasks/partials/pkgng.yml deleted file mode 100644 index cdf3d57df..000000000 --- a/ansible/roles/package-upgrade/tasks/partials/pkgng.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- - -# -# Updates all packages for freebsd-based distributions -# - - - name: upgrade installed packages - raw: pkg upgrade -y -q - - - name: package cleanup - raw: pkg clean -y -q diff --git a/ansible/roles/package-upgrade/vars/main.yml b/ansible/roles/package-upgrade/vars/main.yml index e18ce11fd..f66814e75 100644 --- a/ansible/roles/package-upgrade/vars/main.yml +++ b/ansible/roles/package-upgrade/vars/main.yml @@ -8,7 +8,6 @@ 'yum': ['centos', 'rhel7', 'ibmi'], 'apt': ['debian', 'ubuntu'], 'dnf': ['aix72', 'aix73', 'fedora', 'rhel8', 'rhel9'], - 'pkgng': 'freebsd', 'pkgin': 'smartos', 'chocolatey': 'win', 'brew': 'macos' diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index d78d1f0ac..a03ab938f 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -54,9 +54,6 @@ def buildExclusions = [ // SmartOS ----------------------------------------------- [ /^smartos22/, anyType, gte(26) ], - // FreeBSD ----------------------------------------------- - [ /^freebsd13/, anyType, gte(22) ], // https://github.com/nodejs/node/issues/54576 - // Shared libs docker containers ------------------------- [ /sharedlibs_debug_x64/, anyType, gte(22) ], [ /sharedlibs_openssl110/, anyType, gte(22) ],