From ec845161001aa3236de8ca437b2ee757d56d515a Mon Sep 17 00:00:00 2001 From: Jeremy Poulin Date: Thu, 27 Sep 2018 15:59:51 -0400 Subject: [PATCH] Upgrading to latest provisioner and API handle update. (#11) * Upping the release version * Removed workspace and updated Jenkinsfile to work with my dev env * Making the test template production ready --- Jenkinsfile | 8 ++--- workspace/PinFile | 45 ------------------------ workspace/credentials/.empty | 0 workspace/inventories/group_vars/all.yml | 15 -------- workspace/resources/.empty | 0 5 files changed, 4 insertions(+), 64 deletions(-) delete mode 100644 workspace/PinFile delete mode 100644 workspace/credentials/.empty delete mode 100644 workspace/inventories/group_vars/all.yml delete mode 100644 workspace/resources/.empty diff --git a/Jenkinsfile b/Jenkinsfile index 46e05b4..18aed21 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,12 +8,12 @@ properties( name: 'ARCHES' ), string( - defaultValue: 'https://github.com/RedHat-MultiArch-QE/multiarch-ci-libraries', + defaultValue: 'https://github.com/redhat-multiarch-qe/multiarch-ci-libraries', description: 'Repo for shared libraries.', name: 'LIBRARIES_REPO' ), string( - defaultValue: 'v1.1', + defaultValue: 'v1.2.0', description: 'Git reference to the branch or tag of shared libraries.', name: 'LIBRARIES_REF' ), @@ -50,9 +50,9 @@ library( List arches = params.ARCHES.tokenize(',') def errorMessages = '' -def config = TestUtils.getProvisioningConfig(this) +def config = API.v1.getProvisioningConfig(this) -TestUtils.runParallelMultiArchTest( +API.v1.runParallelMultiArchTest( this, arches, config, diff --git a/workspace/PinFile b/workspace/PinFile deleted file mode 100644 index 3380a3f..0000000 --- a/workspace/PinFile +++ /dev/null @@ -1,45 +0,0 @@ ---- -jenkins-slave: - topology: - topology_name: jenkins-slave - resource_groups: - - resource_group_name: beaker-slaves - resource_group_type: beaker - resource_definitions: - - role: bkr_server - {% if job_group %} - job_group: {{ job_group }} - {% endif %} - whiteboard: "{{ arch }} slave for multiarch testing" - # options to configure amount of time spent polling beaker: - # 180 attempts with 60 seconds wait time between them, - # provisioning timeout is roughly 10800 seconds - max_attempts: 180 - attempt_wait_time: 60 - # option to set cancellation message if linchpin cancels provisioning - cancel_message: Job cancelled due to beaker request timeout - recipesets: - - distro: "RHEL-7.4" - arch: {{ arch }} - variant: Server - count: 1 - name: "Jenkins Slave" - {% if hostrequires %} - hostrequires: - {% for req in hostrequires %} - - tag: "{{ req.tag }}" - op: "{{ req.op }}" - value: "{{ req.value }}" - {% endfor %} - {% endif %} - layout: - inventory_layout: - hosts: - jenkins-slave: - count: 1 - host_groups: - - rhel7 - - certificate_authority - - repositories - - jenkins_slave - - master_node diff --git a/workspace/credentials/.empty b/workspace/credentials/.empty deleted file mode 100644 index e69de29..0000000 diff --git a/workspace/inventories/group_vars/all.yml b/workspace/inventories/group_vars/all.yml deleted file mode 100644 index b7b8a8d..0000000 --- a/workspace/inventories/group_vars/all.yml +++ /dev/null @@ -1,15 +0,0 @@ -ansible_user: root -ansible_private_key_file: ~/.ssh/id_rsa -ansible_connection: ssh -certificate_authority_urls: - - https://password.corp.redhat.com/legacy.crt - - https://password.corp.redhat.com/RH-IT-Root-CA.crt - - https://engineering.redhat.com/Eng-CA.crt -rhel_base_urls: - x86_64: "http://pulp.dist.prod.ext.phx2.redhat.com/content/dist/rhel/server/7/7Server" - ppc64le: "http://pulp.dist.prod.ext.phx2.redhat.com/content/dist/rhel/power-le/7/7Server" - s390x: "http://pulp.dist.prod.ext.phx2.redhat.com/content/dist/rhel/system-z/7/7Server" - aarch64: "http://pulp.dist.prod.ext.phx2.redhat.com/content/dist/rhel/arm/7/7Server" -rhel_base: "{{ rhel_base_urls[arch] }}" -# Set pre_upload_files to empty array so it isn't undefined -pre_upload_files: [] diff --git a/workspace/resources/.empty b/workspace/resources/.empty deleted file mode 100644 index e69de29..0000000