From ec16e142e9f22a6d965a14ce943c83ca560b91ec Mon Sep 17 00:00:00 2001 From: James Adams Date: Tue, 11 Nov 2014 11:03:29 +0000 Subject: [PATCH 1/7] Build packages for client and yum repositories As discussed at Madrid workshop. Fixes #16. Fixes #17. --- src/pom.xml | 61 ++++++++ src/quattor-client/pom.xml | 126 +++++++++++++++++ src/quattor-client/src/README | 3 + src/quattor-repo/pom.xml | 131 ++++++++++++++++++ src/quattor-repo/src/RPM-GPG-KEY-quattor-jrha | 30 ++++ src/quattor-repo/src/quattor.repo | 14 ++ 6 files changed, 365 insertions(+) create mode 100644 src/pom.xml create mode 100644 src/quattor-client/pom.xml create mode 100644 src/quattor-client/src/README create mode 100644 src/quattor-repo/pom.xml create mode 100644 src/quattor-repo/src/RPM-GPG-KEY-quattor-jrha create mode 100644 src/quattor-repo/src/quattor.repo diff --git a/src/pom.xml b/src/pom.xml new file mode 100644 index 0000000000..8192c9ffcf --- /dev/null +++ b/src/pom.xml @@ -0,0 +1,61 @@ + + + + 4.0.0 + org.quattor + quattor-release + pom + + 14.10.0-rc3-SNAPSHOT + + Quattor Release Packages + Utility packages for using Quattor releases. + + org.sonatype.oss + oss-parent + 7 + + + + + quattor.releases + Releases + http://stratuslab-srv01.lal.in2p3.fr:8081/content/repositories/quattor-releases/ + + + quattor.snapshots + Snapshots + http://stratuslab-srv01.lal.in2p3.fr:8081/content/repositories/quattor-snapshots/ + + + + + scm:git:git://github.com/quattor/release.git + scm:git:git@github.com:quattor/release.git + https://github.com/quattor/release + + + + quattor-client + quattor-repo + + + + + + + org.apache.maven.plugins + maven-release-plugin + 2.1 + + forked-path + false + -Psonatype-oss-release -Dgpg.useagent=true + + + + + + + + diff --git a/src/quattor-client/pom.xml b/src/quattor-client/pom.xml new file mode 100644 index 0000000000..0382483016 --- /dev/null +++ b/src/quattor-client/pom.xml @@ -0,0 +1,126 @@ + + + 4.0.0 + + org.quattor.client + quattor-client + + rpm + 14.10.0-rc3-SNAPSHOT + Quattor meta RPM for bootstrapping client systems. + + + org.quattor.maven + build-profile + 1.32 + + + + + Apache 2 License + http://www.opensource.org/licenses/apache2.0 + Copyright (c) Responsible Organization + + + + + + James Adams + james.adams@stfc.ac.uk + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + tarballs + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + pod2man + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + filter-sources + process-sources + + copy-resources + + + ${project.build.directory} + + + src + + *.repo + + true + + + + + + + + + org.codehaus.mojo + rpm-maven-plugin + true + + Quattor client meta-package + ${project.artifactId} + https://github.com/quattor/release + + ccm + cdp-listend + ncm-cdispd + ncm-ncd + ncm-query + perl-AppConfig + perl-CAF + perl-GSSAPI + perl-LC + + 755 + + + /etc/quattor/ + 644 + root + root + false + + + src/README + + + true + + + + + + + + + + diff --git a/src/quattor-client/src/README b/src/quattor-client/src/README new file mode 100644 index 0000000000..3c52e7f615 --- /dev/null +++ b/src/quattor-client/src/README @@ -0,0 +1,3 @@ +Quattor client installed by meta-package + +http://www.quattor.org/ diff --git a/src/quattor-repo/pom.xml b/src/quattor-repo/pom.xml new file mode 100644 index 0000000000..9db9e54523 --- /dev/null +++ b/src/quattor-repo/pom.xml @@ -0,0 +1,131 @@ + + + 4.0.0 + + org.quattor.repo.yum + quattor-repo-yum + + rpm + 14.10.0-rc3-SNAPSHOT + Quattor YUM repositories. + + + org.quattor.maven + build-profile + 1.32 + + + + + Apache 2 License + http://www.opensource.org/licenses/apache2.0 + Copyright (c) Responsible Organization + + + + + + James Adams + james.adams@stfc.ac.uk + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + tarballs + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + pod2man + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + filter-sources + process-sources + + copy-resources + + + ${project.build.directory} + + + src + + *.repo + + true + + + + + + + + + org.codehaus.mojo + rpm-maven-plugin + true + + Quattor YUM Repositories + ${project.artifactId} + https://github.com/quattor/release + + yum + + 755 + + + /etc/yum.repos.d/ + 644 + root + root + false + + + ${project.build.directory}/quattor.repo + + + true + + + /etc/pki/rpm-gpg/ + 644 + root + root + false + + + src/RPM-GPG-KEY-quattor-jrha + + + true + + + + + + + + + + diff --git a/src/quattor-repo/src/RPM-GPG-KEY-quattor-jrha b/src/quattor-repo/src/RPM-GPG-KEY-quattor-jrha new file mode 100644 index 0000000000..5783a1fc9c --- /dev/null +++ b/src/quattor-repo/src/RPM-GPG-KEY-quattor-jrha @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.14 (GNU/Linux) + +mQGiBEru7hYRBACENnVf4PIcywbuJ45Ll1EZBNqtG0JOd1yZSpLypvZkT2yDozLY +9BUTUDXaz+WHDiKFQUJ4/4sCHAdj6YTZ14GR4jir8BVpFftNmqFmDziUUNvbuZbq +yTo4Nann++2kzLiGHX9FJzloSNPc6jed5frmFZHU3SBPMs27TuYD43ugzwCgxVi6 +PsiUK7i/i/iFJtw6/g9rywUD/1BKUUxL01GQHCADnqQce/fjvLvY3wTibp1ZdjUk +iHVdiuyQnVeYUpMqqar6lqCDsJrLg4JnEFHGhEOmoeHIbK7bpjv7iYLfG2xWYVPy +i2YvjAY+noGb06mn/1C/znR9Z/PcEUldx5ufvTKWLQ6zwxqyiMuNf+mRYZ+IEJqH +nXPJA/9Qm93iLAySglbPKoPCx63zZKg4W1lVslSgYQf+NHfQD3IUl3VfMMZkNKNp +FDXDcBI1enUmKiGABrOp/STDM9tgwzaY03/S2fZdCB88Ra8pYUGY2gvw2KECwGAJ +jt3zVz5EaX+FQ7rN7VdUkLltAKqNA+h4m0jnxUd0pV7jOCXDkrRFSmFtZXMgQWRh +bXMgKFJ1dGhlcmZvcmQgQXBwbGV0b24gTGFib3JhdG9yeSkgPGphbWVzLmFkYW1z +QHN0ZmMuYWMudWs+iGAEExECACAFAkru7hYCGwMGCwkIBwMCBBUCCAMEFgIDAQIe +AQIXgAAKCRC/XhVu4BeIZoDCAKDBrntu0BXMamv44ScrOfvPUHoYOwCfStIjYW0o +81OiVAP66iL/6Nv7RNq5Ag0ESu7uFhAIAJzsv6lgGBbG4ua0BkmIXBJSrlufZKRs +uUFl525Jkl9kWbxYjnqkfQ8+iFimmckDDMq4BaXgiwl3vOt0d9kV8zGDwFp0g35/ +TN1IL7iDBX3z8HNvCMMHbyy0Hrj0j4GG+n+Huy9r05xwwSbQv4u+ICSONFUemPKr +lHXEVZ2sT0mfT6uGH1DqOeVUWr7p2onAvm3PlTDAX8weAzeyJABbjeul7BIRtfKY +3yuJTSg7F7vWUzB4G0TbuVLbfHDF4dyo31TJPiU2Wi5zh5+XBFIszqr9Z0IzqgXF +rboRynN+jZcJgvBwi1Wqf18yxRaGpIfxHCdYDr53K0LhVIsSQ27y/NcAAwUH/31p +KR+/xqvtWVuAruv1il/4lVJVU1jDNCXZ0RKtMe00+Q3GhX6eHJKFOkdSMnTfiF+d +DVBtpT0v2eQ5WHOPUvuoxPVkfY+RrtM4AFtPck74SJQcXFCmnZGLcu4tES6rRx/8 +DBIZSs0HZYMptPvihIqR6a8C4ldWiGvFcyuGTjoS5iil4KU9aGYtGpgmf7s9ayxk +qUOK8oMhTSBmql8Oky4bHYo2yRWxKLGwlY5Pr6iBnTP4WWrC6WVwrRkKopbyK+37 +74xlVc+QJ/Lk05Q5mPIGsgVATtZ8G0JrHtosfCK7BHSc2yvX/rR4dw4z19PH+7NM +/PFqGXxJWnDL/NaI5X+ISQQYEQIACQUCSu7uFgIbDAAKCRC/XhVu4BeIZo0+AJ9I +qFIuBoll4nfpscZF6zgGpr/VpACfceROtqejTxFIPnAwMckQt6WhZlM= +=RHsi +-----END PGP PUBLIC KEY BLOCK----- diff --git a/src/quattor-repo/src/quattor.repo b/src/quattor-repo/src/quattor.repo new file mode 100644 index 0000000000..8f53ebf740 --- /dev/null +++ b/src/quattor-repo/src/quattor.repo @@ -0,0 +1,14 @@ +[quattor] +name=Quattor ${project.version} +baseurl=http://yum.quattor.org/${project.version} +enabled=1 + +[quattor-aquilon] +name=Quattor Aquilon +baseurl=http://yum.quattor.org/aquilon +enabled=1 + +[quattor-externals] +name=Quattor Externals +baseurl=http://yum.quattor.org/externals +enabled=1 From 58d9f4e328c6bf5d4ab7a053bf99a23aec416640 Mon Sep 17 00:00:00 2001 From: James Adams Date: Wed, 12 Nov 2014 13:27:39 +0000 Subject: [PATCH 2/7] Configure gpg checking for each repo --- src/quattor-repo/src/quattor.repo | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/quattor-repo/src/quattor.repo b/src/quattor-repo/src/quattor.repo index 8f53ebf740..9e15bcd985 100644 --- a/src/quattor-repo/src/quattor.repo +++ b/src/quattor-repo/src/quattor.repo @@ -2,13 +2,18 @@ name=Quattor ${project.version} baseurl=http://yum.quattor.org/${project.version} enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-quattor-jrha [quattor-aquilon] name=Quattor Aquilon baseurl=http://yum.quattor.org/aquilon enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-quattor-jrha [quattor-externals] name=Quattor Externals baseurl=http://yum.quattor.org/externals enabled=1 +gpgcheck=0 From 4a4aefea2126f3388f80509f0e20efebdf2769f8 Mon Sep 17 00:00:00 2001 From: James Adams Date: Mon, 27 Apr 2015 15:18:46 +0100 Subject: [PATCH 3/7] Install same packages that AII would --- src/quattor-client/pom.xml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/quattor-client/pom.xml b/src/quattor-client/pom.xml index 0382483016..ffff7de9ab 100644 --- a/src/quattor-client/pom.xml +++ b/src/quattor-client/pom.xml @@ -90,15 +90,12 @@ ${project.artifactId} https://github.com/quattor/release + ncm-spma + ncm-cdispd ccm cdp-listend - ncm-cdispd - ncm-ncd ncm-query - perl-AppConfig - perl-CAF - perl-GSSAPI - perl-LC + ncm-ncd 755 From 376b9be95ee6e73f6689e02c2898090dc21f46f2 Mon Sep 17 00:00:00 2001 From: James Adams Date: Mon, 27 Apr 2015 15:25:10 +0100 Subject: [PATCH 4/7] Update repository structure Using naming consistent with template-library-standard. --- src/quattor-repo/src/quattor.repo | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/quattor-repo/src/quattor.repo b/src/quattor-repo/src/quattor.repo index 9e15bcd985..e27000bbd8 100644 --- a/src/quattor-repo/src/quattor.repo +++ b/src/quattor-repo/src/quattor.repo @@ -5,15 +5,21 @@ enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-quattor-jrha -[quattor-aquilon] +[quattor_aquilon] name=Quattor Aquilon baseurl=http://yum.quattor.org/aquilon enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-quattor-jrha -[quattor-externals] +[quattor_externals_arch] name=Quattor Externals -baseurl=http://yum.quattor.org/externals +baseurl=http://yum.quattor.org/externals/$arch/el$release +enabled=1 +gpgcheck=0 + +[quattor_externals_noarch] +name=Quattor Externals +baseurl=http://yum.quattor.org/externals/noarch/el$release enabled=1 gpgcheck=0 From f0de86caf7dda9cd6d4a289e875c4fea62d90bd4 Mon Sep 17 00:00:00 2001 From: James Adams Date: Wed, 6 May 2015 10:46:04 +0100 Subject: [PATCH 5/7] Update to latest maven tools --- src/quattor-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quattor-client/pom.xml b/src/quattor-client/pom.xml index ffff7de9ab..990ffb5591 100644 --- a/src/quattor-client/pom.xml +++ b/src/quattor-client/pom.xml @@ -12,7 +12,7 @@ org.quattor.maven build-profile - 1.32 + 1.43 From be9a43e855244ea3c28c7a9c400ca3eeffbe9a49 Mon Sep 17 00:00:00 2001 From: James Adams Date: Mon, 11 May 2015 16:37:33 +0100 Subject: [PATCH 6/7] Add placeholders to allow test framework to pass We should figure out a better way to fix this. --- src/quattor-client/src/test/perl/README | 1 + src/quattor-repo/src/test/perl/README | 1 + 2 files changed, 2 insertions(+) create mode 100644 src/quattor-client/src/test/perl/README create mode 100644 src/quattor-repo/src/test/perl/README diff --git a/src/quattor-client/src/test/perl/README b/src/quattor-client/src/test/perl/README new file mode 100644 index 0000000000..165348c863 --- /dev/null +++ b/src/quattor-client/src/test/perl/README @@ -0,0 +1 @@ +The test framework relies on `src/test/perl` existing, this file is here to satisfy that requirement for now. diff --git a/src/quattor-repo/src/test/perl/README b/src/quattor-repo/src/test/perl/README new file mode 100644 index 0000000000..165348c863 --- /dev/null +++ b/src/quattor-repo/src/test/perl/README @@ -0,0 +1 @@ +The test framework relies on `src/test/perl` existing, this file is here to satisfy that requirement for now. From 272a5eb56395cd85bc6548679bf1b049929b6f6f Mon Sep 17 00:00:00 2001 From: James Adams Date: Wed, 20 May 2015 04:21:20 +0100 Subject: [PATCH 7/7] Provide quattor release version under /etc More useful than a stubby README. --- src/quattor-client/pom.xml | 6 +++--- src/quattor-client/src/README | 3 --- src/quattor-client/src/quattor-release | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 src/quattor-client/src/README create mode 100644 src/quattor-client/src/quattor-release diff --git a/src/quattor-client/pom.xml b/src/quattor-client/pom.xml index 990ffb5591..df51f4fb3b 100644 --- a/src/quattor-client/pom.xml +++ b/src/quattor-client/pom.xml @@ -71,7 +71,7 @@ src - *.repo + quattor-release true @@ -100,14 +100,14 @@ 755 - /etc/quattor/ + /etc/ 644 root root false - src/README + src/quattor-release true diff --git a/src/quattor-client/src/README b/src/quattor-client/src/README deleted file mode 100644 index 3c52e7f615..0000000000 --- a/src/quattor-client/src/README +++ /dev/null @@ -1,3 +0,0 @@ -Quattor client installed by meta-package - -http://www.quattor.org/ diff --git a/src/quattor-client/src/quattor-release b/src/quattor-client/src/quattor-release new file mode 100644 index 0000000000..039265f46d --- /dev/null +++ b/src/quattor-client/src/quattor-release @@ -0,0 +1 @@ +Quattor ${version}