From e7e82392b5249f52b6fe7ae280286154cff48e9a Mon Sep 17 00:00:00 2001 From: David Galloway Date: Thu, 3 Feb 2022 14:17:35 -0500 Subject: [PATCH] ansible: s/slave/builder s/master/controller Signed-off-by: David Galloway --- ansible/examples/{slave.yml => builder.yml} | 40 +++++++++---------- .../examples/{master.yml => controller.yml} | 2 +- ansible/library/jenkins_node | 2 +- ansible/release.yml | 4 +- ansible/roles/ansible-jenkins/README.rst | 10 ++--- .../files/jobs/jenkins-job-builder/config.xml | 2 +- ansible/slave.yml | 2 +- ansible/slaves/hosts | 8 ---- .../config/definitions/ceph-ansible-prs.yml | 16 ++++---- ceph-container-flake8/build/build | 2 +- ceph-container-lint/build/build | 2 +- .../config/definitions/ceph-dev-build.yml | 2 +- .../config/definitions/ceph-dev-cron.yml | 2 +- .../config/definitions/ceph-dev-new-build.yml | 2 +- .../definitions/ceph-dev-new-trigger.yml | 2 +- .../config/definitions/ceph-dev-new.yml | 2 +- .../config/definitions/ceph-dev-trigger.yml | 2 +- ceph-dev/config/definitions/ceph-dev.yml | 2 +- .../definitions/ceph-iscsi-cli-trigger.yml | 2 +- .../definitions/ceph-iscsi-config-trigger.yml | 2 +- .../definitions/ceph-iscsi-tools-trigger.yml | 2 +- .../config/definitions/ceph-iscsi-trigger.yml | 2 +- .../definitions/ceph-pr-arm-trigger.yml | 2 +- .../config/definitions/kernel-trigger.yml | 2 +- .../config/definitions/mita-deploy.yml | 2 +- nfs-ganesha/build/build_rpm | 2 +- radosgw-agent-pull-requests/build/build | 2 +- .../config/definitions/rtslib-fb-trigger.yml | 2 +- .../config/definitions/samba-trigger.yml | 2 +- scripts/build_utils.sh | 10 ++--- .../definitions/tcmu-runner-trigger.yml | 2 +- 31 files changed, 65 insertions(+), 73 deletions(-) rename ansible/examples/{slave.yml => builder.yml} (95%) rename ansible/examples/{master.yml => controller.yml} (99%) delete mode 100644 ansible/slaves/hosts diff --git a/ansible/examples/slave.yml b/ansible/examples/builder.yml similarity index 95% rename from ansible/examples/slave.yml rename to ansible/examples/builder.yml index 361b1db8..21c31fbf 100644 --- a/ansible/examples/slave.yml +++ b/ansible/examples/builder.yml @@ -1,17 +1,17 @@ --- ## Instead of trying to keep 4 separate playbooks up to date, let's do it all here. -## The only difference from using multiple playbooks is we need to specify `-e libvirt=true` and/or `-e permanent=true` if the slave will be permanent/static. +## The only difference from using multiple playbooks is we need to specify `-e libvirt=true` and/or `-e permanent=true` if the builder will be permanent/static. ## Tested on: CentOS 7, CentOS 8, Xenial, Bionic, Focal, Leap 15.1 using ansible 2.8.5 ## ## Example: -## ansible-playbook -vvv -M ./library/ slave.yml -e '{"labels": "x86_64 xenial etc", "token": "XXXXX", "jenkins_credentials_uuid": "jenkins-build", "api_uri": "https://jenkins.ceph.com"}' -e permanent=true -e ansible_ssh_user=ubuntu --limit braggi01* +## ansible-playbook -vvv -M ./library/ builder.yml -e '{"labels": "x86_64 xenial etc", "token": "XXXXX", "jenkins_credentials_uuid": "jenkins-build", "api_uri": "https://jenkins.ceph.com"}' -e permanent=true -e ansible_ssh_user=ubuntu --limit braggi01* - hosts: all become: true - user: ubuntu # This should be overridden on the CLI (e.g., -e user=centos). It doesn't matter on a mita/prado slave because the playbook is run locally by root. + user: ubuntu # This should be overridden on the CLI (e.g., -e user=centos). It doesn't matter on a mita/prado builder because the playbook is run locally by root. vars: - libvirt: false # Should vagrant be installed? - - permanent: false # Is this a permanent slave? Since the ephemeral (non-permanent) tasks get run more often, we'll default to false. + - permanent: false # Is this a permanent builder? Since the ephemeral (non-permanent) tasks get run more often, we'll default to false. - jenkins_user: 'jenkins-build' #- jenkins_key: This gets defined below now. # jenkins API credentials: @@ -303,7 +303,7 @@ - libvirt|bool tags: always - ## Let's make sure we don't accidentally set up a permanent slave from Sepia as ephemeral + ## Let's make sure we don't accidentally set up a permanent builder from Sepia as ephemeral - set_fact: permanent: true with_items: "{{ ansible_all_ipv4_addresses }}" @@ -318,7 +318,7 @@ tags: always ## EPHEMERAL SLAVE TASKS - # We would occasionally have issues with name resolution on the Ephemeral slaves + # We would occasionally have issues with name resolution on the Ephemeral builder # so we force them to use Google's DNS servers. This has to be done before # package-related tasks to avoid communication errors with various repos. - name: Ephemeral Slave Tasks @@ -408,7 +408,7 @@ ignore_errors: true when: not permanent|bool - ## VAGRANT REPO TASKS (for libvirt slaves) + ## VAGRANT REPO TASKS (for libvirt builders) # vagrant doesn't have repositories, this chacra repo will be better to have # around and can get updates as soon as a new vagrant version is published via # chacractl @@ -440,7 +440,7 @@ update_cache: yes when: ansible_os_family == "Debian" - # Sometimes, slaves would connect to Jenkins and try to run an apt transaction right away. Except apt-daily/unattended-upgrades has the dpkg lock so the Jenkins job would fail. + # Sometimes, builders would connect to Jenkins and try to run an apt transaction right away. Except apt-daily/unattended-upgrades has the dpkg lock so the Jenkins job would fail. - name: Uninstall unattended-upgrades package: name: unattended-upgrades @@ -530,7 +530,7 @@ state: directory owner: "{{ jenkins_user }}" - # On a mita/prado provisioned slave, everything gets put into a 'playbook' dir. + # On a mita/prado provisioned builder, everything gets put into a 'playbook' dir. # Otherwise it can be found in files/ssh/... - set_fact: jenkins_key: "{{ lookup('first_found', key_locations) }}" @@ -543,7 +543,7 @@ - name: Set the authorized keys authorized_key: user: "{{ jenkins_user }}" - key: "{{ lookup('file', '{{ jenkins_key }}')|default('https://raw.githubusercontent.com/ceph/ceph-build/master/ansible/files/ssh/keys/jenkins_build.pub') }}" + key: "{{ lookup('file', '{{ jenkins_key }}')|default('https://raw.githubusercontent.com/ceph/ceph-build/main/ansible/files/ssh/keys/jenkins_build.pub') }}" - name: "Ensure {{ jenkins_user }} can sudo without a prompt" lineinfile: @@ -743,7 +743,7 @@ owner: "{{ jenkins_user }}" tags: github - # On a mita/prado provisioned slave, everything gets put into a 'playbook' dir. + # On a mita/prado provisioned builder, everything gets put into a 'playbook' dir. # If all else fails, get it from github (using the |default) - set_fact: github_key: "{{ lookup('first_found', key_locations) }}" @@ -758,7 +758,7 @@ known_hosts: name: github.com path: '/etc/ssh/ssh_known_hosts' - key: "{{ lookup('file', '{{ github_key }}')|default('https://raw.githubusercontent.com/ceph/ceph-build/master/ansible/files/ssh/hostkeys/github.com.pub') }}" + key: "{{ lookup('file', '{{ github_key }}')|default('https://raw.githubusercontent.com/ceph/ceph-build/main/ansible/files/ssh/hostkeys/github.com.pub') }}" tags: github ## PIP TASKS @@ -857,9 +857,9 @@ -----END CERTIFICATE----- when: ansible_os_family == "RedHat" - ## JENKINS SLAVE AGENT TASKS - # We use SSH for ephemeral slaves - - name: Register ephemeral slave using SSH + ## JENKINS BUILDER AGENT TASKS + # We use SSH for ephemeral builders + - name: Register ephemeral builder using SSH jenkins_node: username: "{{ api_user }}" uri: "{{ api_uri }}" @@ -877,9 +877,9 @@ when: not permanent|bool tags: register - - name: Register Permanent Slave + - name: Register Permanent Builder block: - - name: Register permenant slave using JNLP + - name: Register permenant builder using JNLP jenkins_node: username: "{{ api_user }}" uri: "{{ api_uri }}" @@ -896,10 +896,10 @@ executors: '{{ executors|default(1) }}' exclusive: true - - name: Download slave.jar + - name: Download agent.jar get_url: - url: "{{ api_uri }}/jnlpJars/slave.jar" - dest: "/home/{{ jenkins_user }}/slave.jar" + url: "{{ api_uri }}/jnlpJars/agent.jar" + dest: "/home/{{ jenkins_user }}/agent.jar" force: yes register: jar_changed diff --git a/ansible/examples/master.yml b/ansible/examples/controller.yml similarity index 99% rename from ansible/examples/master.yml rename to ansible/examples/controller.yml index 707439f6..773eefdb 100644 --- a/ansible/examples/master.yml +++ b/ansible/examples/controller.yml @@ -1,6 +1,6 @@ --- -- hosts: jenkins_master +- hosts: jenkins_controller user: cm become: true roles: diff --git a/ansible/library/jenkins_node b/ansible/library/jenkins_node index 64ac95d2..5292433f 100644 --- a/ansible/library/jenkins_node +++ b/ansible/library/jenkins_node @@ -84,7 +84,7 @@ options: host: description: - - hostname or IP for the host to connect to the slave + - hostname or IP for the host to connect to the builder requirements: ['python-jenkins'] author: diff --git a/ansible/release.yml b/ansible/release.yml index e6c57edb..09c54816 100644 --- a/ansible/release.yml +++ b/ansible/release.yml @@ -2,9 +2,9 @@ - hosts: localhost vars: - # should be passed in the CLI like `--extra-vars "version=1.23.45 branch=master"` + # should be passed in the CLI like `--extra-vars "version=1.23.45 branch=main"` version: 0-dev # e.g. 0.78 - branch: master # any existing branch on Github + branch: main # any existing branch on Github release: STABLE # STABLE, RELEASE_CANDIDATE, HOTFIX, and SECURITY are valid options tag_name: "v{{ version}}" project: "ceph" diff --git a/ansible/roles/ansible-jenkins/README.rst b/ansible/roles/ansible-jenkins/README.rst index c3f646f4..dd78bf6b 100644 --- a/ansible/roles/ansible-jenkins/README.rst +++ b/ansible/roles/ansible-jenkins/README.rst @@ -1,7 +1,7 @@ ansible-jenkins =============== -This role will allow you to install a new Jenkins master from scratch or manage an existing instance. +This role will allow you to install a new Jenkins server from scratch or manage an existing instance. It assumes the following: @@ -15,9 +15,9 @@ The role is idempotent but it should be noted that the Jenkins service will be r Initial Installation -------------------- -To set up a new Jenkins master from scratch: +To set up a new Jenkins server from scratch: 1. ``cd ceph-build/ansible`` -2. ``cp examples/master.yml .`` -3. ``ansible-playbook master.yml --limit="new.jenkins.example.com" --extra-vars="{github_oauth_client: 'foo',github_oauth_secret: 'bar'}"`` -4. Continue with https://github.com/ceph/ceph-sepia-secrets/blob/master/jenkins-master.rst +2. ``cp examples/controller.yml .`` +3. ``ansible-playbook controller.yml --limit="new.jenkins.example.com" --extra-vars="{github_oauth_client: 'foo',github_oauth_secret: 'bar'}"`` +4. Continue with https://github.com/ceph/ceph-sepia-secrets/blob/main/jenkins-controller.rst diff --git a/ansible/roles/ansible-jenkins/files/jobs/jenkins-job-builder/config.xml b/ansible/roles/ansible-jenkins/files/jobs/jenkins-job-builder/config.xml index 26056d2d..e7d7b58b 100644 --- a/ansible/roles/ansible-jenkins/files/jobs/jenkins-job-builder/config.xml +++ b/ansible/roles/ansible-jenkins/files/jobs/jenkins-job-builder/config.xml @@ -23,7 +23,7 @@ - master + main diff --git a/ansible/slave.yml b/ansible/slave.yml index b9862807..82278e9a 120000 --- a/ansible/slave.yml +++ b/ansible/slave.yml @@ -1 +1 @@ -examples/slave.yml \ No newline at end of file +builder.yml \ No newline at end of file diff --git a/ansible/slaves/hosts b/ansible/slaves/hosts deleted file mode 100644 index 5b50447d..00000000 --- a/ansible/slaves/hosts +++ /dev/null @@ -1,8 +0,0 @@ -[rpm] -jenkins-centos6-5.front.sepia.ceph.com -jenkins-centos7.front.sepia.ceph.com -jenkins-centos6-5b.front.sepia.ceph.com -jenkins-centos7b.front.sepia.ceph.com - -[deb] -mira062.front.sepia.ceph.com diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml index 3daf5a97..d0408a02 100644 --- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml +++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml @@ -1,6 +1,6 @@ - project: name: ceph-ansible-prs-braggi-adami - slave_labels: 'vagrant && libvirt && (braggi||adami)' + builder_labels: 'vagrant && libvirt && (braggi||adami)' distribution: - centos deployment: @@ -23,7 +23,7 @@ - project: name: ceph-ansible-prs - slave_labels: 'vagrant && libvirt && (smithi || braggi || centos8)' + builder_labels: 'vagrant && libvirt && (smithi || braggi || centos8)' distribution: - centos deployment: @@ -39,7 +39,7 @@ - project: name: ceph-ansible-prs-docker2podman - slave_labels: 'vagrant && libvirt && (smithi || braggi || centos8)' + builder_labels: 'vagrant && libvirt && (smithi || braggi || centos8)' distribution: - centos deployment: @@ -51,7 +51,7 @@ - project: name: ceph-ansible-prs-cephadm - slave_labels: 'vagrant && libvirt && (adami || braggi)' + builder_labels: 'vagrant && libvirt && (adami || braggi)' distribution: - centos deployment: @@ -64,7 +64,7 @@ - project: name: ceph-ansible-prs-purge-dashboard - slave_labels: 'vagrant && libvirt && (adami || braggi)' + builder_labels: 'vagrant && libvirt && (adami || braggi)' distribution: - centos deployment: @@ -77,7 +77,7 @@ - project: name: ceph-ansible-prs-common-trigger - slave_labels: 'vagrant && libvirt && (smithi || braggi || centos8)' + builder_labels: 'vagrant && libvirt && (smithi || braggi || centos8)' distribution: - centos deployment: @@ -107,7 +107,7 @@ - job-template: name: 'ceph-ansible-prs-{distribution}-{deployment}-{scenario}' id: 'ceph-ansible-prs-auto' - node: '{slave_labels}' + node: '{builder_labels}' concurrent: true defaults: global display-name: 'ceph-ansible: Pull Requests [{distribution}-{deployment}-{scenario}]' @@ -215,7 +215,7 @@ - job-template: name: 'ceph-ansible-prs-{distribution}-{deployment}-{scenario}' id: 'ceph-ansible-prs-common-trigger' - node: '{slave_labels}' + node: '{builder_labels}' concurrent: true defaults: global display-name: 'ceph-ansible: Pull Requests [{distribution}-{deployment}-{scenario}]' diff --git a/ceph-container-flake8/build/build b/ceph-container-flake8/build/build index e97b399a..6c09fc93 100755 --- a/ceph-container-flake8/build/build +++ b/ceph-container-flake8/build/build @@ -28,7 +28,7 @@ function check(){ } function main() { - # install some of our dependencies if running on a jenkins slave + # install some of our dependencies if running on a jenkins builder if [[ -n "$HUDSON_URL" ]] then sudo yum -y install epel-release diff --git a/ceph-container-lint/build/build b/ceph-container-lint/build/build index 03e5d471..e6e606d8 100755 --- a/ceph-container-lint/build/build +++ b/ceph-container-lint/build/build @@ -31,7 +31,7 @@ function check(){ } function main() { - # install some of our dependencies if running on a jenkins slave + # install some of our dependencies if running on a jenkins builder if [[ -n "$HUDSON_URL" ]] then sudo yum -y install epel-release diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml index 1ee340dc..8c3fa746 100644 --- a/ceph-dev-build/config/definitions/ceph-dev-build.yml +++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml @@ -1,6 +1,6 @@ - job: name: ceph-dev-build - node: master + node: controller project-type: matrix defaults: global display-name: 'ceph-dev-build' diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml index 10183530..c7641624 100644 --- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml +++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml @@ -1,6 +1,6 @@ - job: name: 'ceph-dev-cron' - node: master + node: controller project-type: freestyle defaults: global concurrent: true diff --git a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml index 493907e5..d89ac302 100644 --- a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml +++ b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml @@ -1,6 +1,6 @@ - job: name: ceph-dev-new-build - node: master + node: controller project-type: matrix defaults: global display-name: 'ceph-dev-new-build' diff --git a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml index 40528314..f65f4179 100644 --- a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml +++ b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml @@ -1,6 +1,6 @@ - job: name: ceph-dev-new-trigger - node: master + node: controller project-type: freestyle defaults: global quiet-period: 5 diff --git a/ceph-dev-new/config/definitions/ceph-dev-new.yml b/ceph-dev-new/config/definitions/ceph-dev-new.yml index f1ddaad6..87f10cca 100644 --- a/ceph-dev-new/config/definitions/ceph-dev-new.yml +++ b/ceph-dev-new/config/definitions/ceph-dev-new.yml @@ -1,7 +1,7 @@ - job: name: ceph-dev-new description: 'This job builds branches from https://github.com/ceph/ceph-ci for testing purposes.' - node: master + node: controller project-type: multijob defaults: global concurrent: true diff --git a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml index 2405e3a2..221f5cd5 100644 --- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml +++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml @@ -1,7 +1,7 @@ - job: disabled: true name: ceph-dev-trigger - node: master + node: controller project-type: freestyle defaults: global quiet-period: 5 diff --git a/ceph-dev/config/definitions/ceph-dev.yml b/ceph-dev/config/definitions/ceph-dev.yml index 3c8a0b4d..b246249c 100644 --- a/ceph-dev/config/definitions/ceph-dev.yml +++ b/ceph-dev/config/definitions/ceph-dev.yml @@ -1,7 +1,7 @@ - job: name: ceph-dev description: 'This job builds branches from https://github.com/ceph/ceph for testing purposes.' - node: master + node: controller project-type: multijob defaults: global concurrent: true diff --git a/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml b/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml index 15e25d12..17181321 100644 --- a/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml +++ b/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml @@ -1,6 +1,6 @@ - job: name: ceph-iscsi-cli-trigger - node: master + node: controller project-type: freestyle defaults: global quiet-period: 5 diff --git a/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml b/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml index dd51a99a..23274c0e 100644 --- a/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml +++ b/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml @@ -1,6 +1,6 @@ - job: name: ceph-iscsi-config-trigger - node: master + node: controller project-type: freestyle defaults: global quiet-period: 5 diff --git a/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml b/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml index 5db7fcd4..bd9ba096 100644 --- a/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml +++ b/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml @@ -1,6 +1,6 @@ - job: name: ceph-iscsi-tools-trigger - node: master + node: controller project-type: freestyle defaults: global quiet-period: 5 diff --git a/ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml b/ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml index e738b1ac..b34c4296 100644 --- a/ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml +++ b/ceph-iscsi-trigger/config/definitions/ceph-iscsi-trigger.yml @@ -1,6 +1,6 @@ - job: name: ceph-iscsi-trigger - node: master + node: controller project-type: freestyle defaults: global quiet-period: 5 diff --git a/ceph-pr-arm-trigger/config/definitions/ceph-pr-arm-trigger.yml b/ceph-pr-arm-trigger/config/definitions/ceph-pr-arm-trigger.yml index bbea12bc..ff13b19b 100644 --- a/ceph-pr-arm-trigger/config/definitions/ceph-pr-arm-trigger.yml +++ b/ceph-pr-arm-trigger/config/definitions/ceph-pr-arm-trigger.yml @@ -1,6 +1,6 @@ - job: name: ceph-pr-arm-trigger - node: master + node: controller # disabled for now because this is not passing the right BRANCH to # `ceph-dev` which causes failures there disabled: true diff --git a/kernel-trigger/config/definitions/kernel-trigger.yml b/kernel-trigger/config/definitions/kernel-trigger.yml index 957dc9f0..b9b6b04e 100644 --- a/kernel-trigger/config/definitions/kernel-trigger.yml +++ b/kernel-trigger/config/definitions/kernel-trigger.yml @@ -1,6 +1,6 @@ - job: name: kernel-trigger - node: master + node: controller project-type: freestyle defaults: global quiet-period: 5 diff --git a/mita-deploy/config/definitions/mita-deploy.yml b/mita-deploy/config/definitions/mita-deploy.yml index 813a2b21..01ddb1e4 100644 --- a/mita-deploy/config/definitions/mita-deploy.yml +++ b/mita-deploy/config/definitions/mita-deploy.yml @@ -12,7 +12,7 @@ - job: name: mita-deploy - node: master + node: controller description: "This job clones mita and deploys it to its production server based on the BRANCH value" display-name: 'mita-deploy' block-downstream: false diff --git a/nfs-ganesha/build/build_rpm b/nfs-ganesha/build/build_rpm index cd1ae371..980447af 100644 --- a/nfs-ganesha/build/build_rpm +++ b/nfs-ganesha/build/build_rpm @@ -21,7 +21,7 @@ then sudo yum-config-manager --enable PowerTools || sudo yum-config-manager --enable powertools fi -# Clean up Jenkins slave before each build +# Clean up Jenkins builder before each build sudo rm -rf /var/cache/yum/* sudo yum -y clean all sudo yum -y remove librgw-devel librgw2 librados-devel librados3 libcephfs-devel libcephfs2 diff --git a/radosgw-agent-pull-requests/build/build b/radosgw-agent-pull-requests/build/build index 3500acd2..b56288d9 100644 --- a/radosgw-agent-pull-requests/build/build +++ b/radosgw-agent-pull-requests/build/build @@ -14,7 +14,7 @@ install_python_packages $TEMPVENV "pkgs[@]" # 2.6 and 2.7) # # These job-specific requirements aren't met by the services in charge of -# creating slaves (mainly prado.ceph.com) because those slaves have "generic" +# creating Jenkins builders (mainly prado.ceph.com) because those slaves have "generic" # requirements and usually do not care about specific needs like Python 2.6 cd "$WORKSPACE/ceph-build/ceph-deploy-pull-requests/setup/playbooks" diff --git a/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml b/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml index b14d2167..13bef3c2 100644 --- a/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml +++ b/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml @@ -1,6 +1,6 @@ - job: name: rtslib-fb-trigger - node: master + node: controller project-type: freestyle defaults: global quiet-period: 5 diff --git a/samba-trigger/config/definitions/samba-trigger.yml b/samba-trigger/config/definitions/samba-trigger.yml index 907bcf3f..1e34674b 100644 --- a/samba-trigger/config/definitions/samba-trigger.yml +++ b/samba-trigger/config/definitions/samba-trigger.yml @@ -1,6 +1,6 @@ - job: name: samba-trigger - node: master + node: controller project-type: freestyle defaults: global quiet-period: 5 diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index 60d8d558..37944c85 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -144,7 +144,7 @@ install_python_packages_no_binary () { mkdir -p $PIP_SDIST_INDEX # We started pinning pip to 10.0.0 as the default to prevent mismatching - # versions on non-ephemeral slaves. Some jobs require different or latest + # versions on non-ephemeral Jenkins builders. Some jobs require different or latest # pip though so these if statements allow for that. # Updated to 20.3.4 in March 2021 because 10.0.0 is just too old. if [ "$2" == "latest" ]; then @@ -207,7 +207,7 @@ install_python_packages () { export LC_ALL=en_US.UTF-8 # We started pinning pip to 10.0.0 as the default to prevent mismatching - # versions on non-ephemeral slaves. Some jobs require different or latest + # versions on non-ephemeral Jenkins builders. Some jobs require different or latest # pip though so these if statements allow for that. # Updated to 20.3.4 in March 2021 because 10.0.0 is just too old. if [ "$2" == "latest" ]; then @@ -546,7 +546,7 @@ setup_pbuilder() { else # this assumes that newer Debian releases are being added to # /etc/apt/trusted.gpg that is also the default location for Ubuntu trusted - # keys. The slave should ensure that the needed keys are added accordingly + # keys. The Jenkins builder should ensure that the needed keys are added accordingly # to this location. debootstrapopts='DEBOOTSTRAPOPTS=( "--keyring" "/etc/apt/trusted.gpg" )' fi @@ -1101,7 +1101,7 @@ restart_libvirt_services() { sudo service libvirt-guests restart } -# Function to update vagrant boxes on static libvirt slaves used for ceph-ansible and ceph-docker testing +# Function to update vagrant boxes on static libvirt Jenkins builders used for ceph-ansible and ceph-docker testing update_vagrant_boxes() { outdated_boxes=`vagrant box outdated --global | grep 'is outdated' | awk '{ print $2 }' | tr -d "'"` if [ -n "$outdated_boxes" ]; then @@ -1264,7 +1264,7 @@ collect_ceph_logs() { # this is meant to be run in a testing scenario directory # with running vagrant vms. the ansible playbook will connect # to your test nodes and fetch any ceph logs that are present - # in /var/log/ceph and store them on the jenkins slave. + # in /var/log/ceph and store them on the jenkins builder. # these logs can then be archived using the JJB archive publisher limit=$1 diff --git a/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml b/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml index 9239fb6b..e10a1993 100644 --- a/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml +++ b/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml @@ -1,6 +1,6 @@ - job: name: tcmu-runner-trigger - node: master + node: controller project-type: freestyle defaults: global quiet-period: 5 -- 2.39.5