From 287c5ca6bd2c456c6d7fddf52067055ca5678fa6 Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Jun 20 2019 07:43:11 +0000 Subject: Change parent job to build w/o dlrn --- diff --git a/README b/README deleted file mode 100644 index 3832cc2..0000000 --- a/README +++ /dev/null @@ -1,6 +0,0 @@ -# sf-jobs content - -This directory contains Zuul jobs. -It includes of in-progress openstack-infra/zuul-jobs. -It can also be used to store local jobs to be used by any projects in the local tenant. - diff --git a/mocks/fedora-rawhide-x86_64.cfg b/mocks/fedora-rawhide-x86_64.cfg deleted file mode 100644 index a9852ce..0000000 --- a/mocks/fedora-rawhide-x86_64.cfg +++ /dev/null @@ -1,92 +0,0 @@ -config_opts['root'] = 'fedora-rawhide-x86_64' -config_opts['target_arch'] = 'x86_64' -config_opts['legal_host_arches'] = ('x86_64',) -# config_opts['module_enable'] = ['list', 'of', 'modules'] -# config_opts['module_install'] = ['module1/profile', 'module2/profile'] -config_opts['chroot_setup_cmd'] = 'install @buildsys-build python git python2-setuptools python3-setuptools' -config_opts['dist'] = 'rawhide' # only useful for --resultdir variable subst -config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['releasever'] = '31' - -config_opts['package_manager'] = 'dnf' - -config_opts['yum.conf'] = """ -[main] -keepcache=1 -debuglevel=2 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= -install_weak_deps=0 -metadata_expire=0 -best=1 -module_platform_id=platform:f31 - -# repos - -[fedora] -name=fedora -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -skip_if_unavailable=False - -[local] -name=local -baseurl=https://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64/ -cost=2000 -enabled=0 -skip_if_unavailable=False - -[fedora-debuginfo] -name=Fedora Rawhide - x86_64 - Debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-debug&arch=$basearch -enabled=0 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -skip_if_unavailable=False - -[fedora-source] -name=fedora-source -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-source&arch=$basearch -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -gpgcheck=1 -enabled=0 -skip_if_unavailable=False - -# modular - -[rawhide-modular] -name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -skip_if_unavailable=False - -[rawhide-modular-debuginfo] -name=Fedora - Modular Rawhide - Debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-debug&arch=$basearch -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -skip_if_unavailable=False - -[rawhide-modular-source] -name=Fedora - Modular Rawhide - Source -metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-source&arch=$basearch -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-30-primary -skip_if_unavailable=False - - -# SPECULATIVE REPO HERE - - -""" diff --git a/playbooks/rpm/rpmtest.yaml b/playbooks/rpm/rpmtest.yaml new file mode 100644 index 0000000..1f27eb7 --- /dev/null +++ b/playbooks/rpm/rpmtest.yaml @@ -0,0 +1,11 @@ +--- +- hosts: node + roles: + - repo-setup + - run-tests-yml + pre_tasks: + - name: install system deps + yum: + name: ansible + state: present + become: true diff --git a/playbooks/rpmbuild.yaml b/playbooks/rpmbuild.yaml deleted file mode 100644 index e8502f7..0000000 --- a/playbooks/rpmbuild.yaml +++ /dev/null @@ -1,17 +0,0 @@ -- hosts: node - roles: - - ensure-dlrn - - dlrn-prepare - - dlrn-build - - dlrn-fetch - pre_tasks: - - name: install system deps - yum: - name: git, createrepo, mock, redhat-rpm-config, rpmdevtools - state: present - become: true - vars: - pip_executable: /usr/bin/pip3 - dlrn_repo: https://github.com/morucci/DLRN.git - dlrn_version: local - dlrn_config_dir: stg.pagure.io/fedora-zuul-packaging-jobs/mocks diff --git a/playbooks/rpmtest.yaml b/playbooks/rpmtest.yaml deleted file mode 100644 index dfb4eb6..0000000 --- a/playbooks/rpmtest.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- hosts: node - roles: - - dlrn-setup - - run-tests-yml - pre_tasks: - - name: install system deps - yum: - name: ansible - state: present - become: true diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index d556c8b..f5a6dc9 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -1,18 +1,31 @@ - job: name: rawhide-rpm-koji-scratch-build - parent: base-rpm-koji-scratch-build - description: RPM scratch build on Koji for rawhide target + parent: base-rpm-scratch-build + description: RPM scratch build on for rawhide target vars: - dlrn_project: fedora-rawhide-x86_64 - koji_build_target: rawhide + mock_config: fedora-rawhide-x86_64 + target: rawhide + nodeset: + nodes: + - name: mock-host + label: cloud-fedora - job: name: rawhide-rpm-test description: Run the test.yml test roles: - zuul: zuul-distro-jobs - requires: dlrn-repo - run: playbooks/rpmtest.yaml + requires: repo + run: playbooks/rpm/rpmtest.yaml + nodeset: + nodes: + - name: node + label: cloud-fedora + +- job: + name: artifact-rpm-lint + parent: base-artifact-rpm-lint + requires: repo nodeset: nodes: - name: node