diff options
| author | Christoph Junghans <junghans@lanl.gov> | 2019-02-23 15:27:39 -0700 |
|---|---|---|
| committer | Christoph Junghans <junghans@lanl.gov> | 2019-02-23 15:27:39 -0700 |
| commit | 73983a2a8c7a0a07e60879eafc908c33d33bdd0e (patch) | |
| tree | e2ee4c9f4f995c5bafa9db67a1f1258f767b352c | |
| parent | 718a096ff4ad6fad41153109eb4dd698e525859b (diff) | |
| download | fedora-review-73983a2a8c7a0a07e60879eafc908c33d33bdd0e.tar.gz fedora-review-73983a2a8c7a0a07e60879eafc908c33d33bdd0e.tar.xz fedora-review-73983a2a8c7a0a07e60879eafc908c33d33bdd0e.zip | |
libaec: refactor of review.sh
| -rw-r--r-- | .travis.yml | 20 | ||||
| -rwxr-xr-x | review.sh | 21 |
2 files changed, 23 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index ce13802..69379f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,24 +13,8 @@ script: - PKG=$(git log -1 --pretty=%s | sed 's/:.*//') - if [[ ! -d ${PKG} ]]; then echo "Directory ${PKG} not found"; exit 1; fi - if [[ ! -f ${PKG}/${PKG}.spec ]]; then echo "No spec file (${PKG}.spec found in directory ${PKG}"; exit 1; fi - - | - { - H="/travis/${PKG}" - echo "#!/bin/bash -xe" - echo "dnf -q -y install fedora-review spectool" - echo "spectool -g ${PKG}.spec" - echo "rpmbuild -D'_sourcedir ${H}' -D'_srcrpmdir ${H}' -bs ${H}/${PKG}.spec" - echo "useradd -d ${H} -g mock review" - echo "chown -R review:mock ${H}" - echo "systemd-machine-id-setup" - echo "/travis/spinner.sh \"su - -c 'fedora-review -v --mock-config ${MOCK_CONFIG} --mock-options --old=chroot -n ${PKG}' review\" || { cat ${H}/.cache/fedora-review.log; find ${H}/review-${PKG} -name '*.log' -print -exec cat {} \\;; exit 1; }" - echo "find ${H}/review-${PKG} -name '*.log' -print -exec cat {} \\;" - echo "cat ${H}/review-${PKG}/licensecheck.txt" - echo "cat ${H}/review-${PKG}/review.txt" - } > review.sh - - chmod +x review.sh - - docker run --privileged -v "${PWD}:/travis:rw" -it fedora:latest /travis/review.sh - - sudo chown -R travis:travis ${PWD} + - docker run --privileged -v "${PWD}:/travis:rw" -it fedora:latest /travis/review.sh "${PKG}" ${MOCK_CONFIG}" + - sudo chown -R travis:travis ${PWD} after_success: - git config --global user.name "Automatic Deployment (Travis CI)" diff --git a/review.sh b/review.sh new file mode 100755 index 0000000..4a07517 --- /dev/null +++ b/review.sh @@ -0,0 +1,21 @@ +#!/bin/bash -xe + +PKG="$1" +MOCK_CONFIG="$2" +H=/travis/$PKG + +dnf -q -y install fedora-review spectool +useradd -d ${H} -g mock review +cd /travis/$PKG +spectool -g ${PKG}.spec +rpmbuild -D'_sourcedir ${PWD}' -D'_srcrpmdir ${PWD}' -bs ${PKG}.spec + +chown -R review:mock ${H} +if ! /travis/spinner.sh "su - -c 'fedora-review -v --mock-config ${MOCK_CONFIG} --mock-options --old=chroot -n ${PKG}' review"; then + cat .cache/fedora-review.log + find review-${PKG} -name '*.log' -print -exec cat {} ; + exit 1 +fi +find review-${PKG} -name '*.log' -print -exec cat {} ; +cat review-${PKG}/licensecheck.txt +cat review-${PKG}/review.txt |