From 12427fa4eaecba9201a48bcb2e2619a452e1f200 Mon Sep 17 00:00:00 2001 From: "Mark A. Grondona" Date: Tue, 19 Feb 2019 13:45:30 -0800 Subject: [PATCH 1/5] travis-ci: unshallow git repo before running docker On travis-ci the version of git(1) inside of our docker image may be too old for the `git fetch --unshallow --tags` to succeed, as evidenced by errors like: git fetch --unshallow --tags fatal: unknown value for config 'protocol.version': 2 in our travis builds. To ensure we don't hit this error, run the command to fetch tags *before* running docker, using the version of git installed in travis. Fixes #2024 --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index b4c3f7b06715..eaee16ccae75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -122,6 +122,9 @@ before_install: fi script: + # Unshallow repository so git describe works. + # (The one inside docker-run-checks may fail if git version is too old) + - git fetch --unshallow --tags - | src/test/docker/docker-run-checks.sh -j2 \ --image=${IMG} \ From 154ec12fffffa0b16359ba51b6198e758390e2e9 Mon Sep 17 00:00:00 2001 From: "Mark A. Grondona" Date: Wed, 27 Feb 2019 17:10:29 +0000 Subject: [PATCH 2/5] travis-ci: pin pylint to version 2.2.2 Problem: upgrading pylint with every travis-ci run may result in expected errors unrelated to the PR or master being tested. Instead of running `pip install --upgrade pylint`, pin the pylint version to the last-known working version: 2.2.2. Partial fix for #2052. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eaee16ccae75..22eb330b96d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ jobs: name: 'python lint' language: 'python' python: '3.6' - install: pip install --upgrade pylint + install: pip install 'pylint==2.2.2' --force-reinstall script: pylint --rcfile=src/bindings/python/.pylintrc src/bindings/python/flux before_deploy: skip deploy: skip From 4275b9573c08b967a9ad476e8aac75b066fc5a68 Mon Sep 17 00:00:00 2001 From: "Mark A. Grondona" Date: Wed, 17 Apr 2019 14:39:51 -0700 Subject: [PATCH 3/5] README.md: update badges to point to v0.11 stable repo Update the travis-ci and codecov.io badges to point to the correct reposotory. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fe17d34f8e9c..49ff087151e6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![Build Status](https://travis-ci.org/flux-framework/flux-core.svg?branch=master)](https://travis-ci.org/flux-framework/flux-core) -[![Coverage Status](https://coveralls.io/repos/flux-framework/flux-core/badge.svg?branch=master&service=github)](https://coveralls.io/github/flux-framework/flux-core?branch=master) +[![Build Status](https://travis-ci.org/flux-framework/flux-core-v0.11.svg?branch=master)](https://travis-ci.org/flux-framework/flux-core) +[![Coverage Status](https://coveralls.io/repos/flux-framework/flux-core-v0.11/badge.svg?branch=master&service=github)](https://coveralls.io/github/flux-framework/flux-core?branch=master) _NOTE: The interfaces of flux-core are being actively developed and are not yet stable._ The github issue tracker is the primary From b8748de4275456fc46856e8fab98b9611889c99e Mon Sep 17 00:00:00 2001 From: Mark Grondona Date: Thu, 18 Apr 2019 00:33:04 +0000 Subject: [PATCH 4/5] travis-ci: update variables and repos for v0.11 stable Update secure travis variables and deploy repo slug to match the v0.11 stable repository. --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22eb330b96d3..8dc40fe655d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,7 +95,9 @@ env: - TAP_DRIVER_QUIET=1 - DOCKERREPO=fluxrm/flux-core - DOCKER_USERNAME=travisflux - - secure: "Uga2i1Yu0PvWMFzOYvM9yxnAMDTgY17ZqeFlIN8MV3uoTCy6y61GULrMkKuhuI1sUfyugpFWVKIJo5jwTpsfG84f3o9lUTRgLPpTA2Xls8A/rmurF/QacVv6hZ2Zs2LQVlrM8BkT36TpT2NfWW2D2238kovqz3l5gIZKMClMvyk=" + # travis encrypt -r flux-framework/flux-core-v0.11 + # DOCKER_PASSWORD=xxxx + - secure: "VzOP9JcziZ8qelU9PE7NJaSbZLoaQ0Ybu/DzqLVN0qfGer+u0R4RlTJvXROcGUQI2tnVWxlGwRqQOLuVNnHTBJGJIR5ZZQColKEsv+JguBjZV/E7o54SbkySptns7YJqf2c7S1//uPx2Vr8XZIlkaYL9Qk9MFfzcWVlszCfcq2zFt6PTwct0QvtuBAy1KwUSP9EygtIGvn5R1FWW/MbW7xn8P613XZ9M87zxJOgXbwhfcsC/VThbBcBx3BUCp5F+1BsQJQIVihQh87/s1EuoPo275g+kEh6S0DWyhWS3lyZ7DeuaYmymH7YTEk9HyC4Hd/0eBoMH/+MYOm+Zls2NLkpzuDz5DZWnsdyZzjOuU6W5h12luxRJMxkuTGNBTcKoj00DB2Z9trOX9n5QdwYp2HK1la21phJ0OmnRg402htSQdH5CHOBfv65O+i5zDyTd8oO2NQUwsatnhF4bK5nrP+MrqPbq9uhHw2siXazCnDTgadOVV3fE5a1uEZ2X7l3HVt6RngHX16/wlyrGCExHS7l2lCncUhBuCg2VMRIXwXrHx3K47GcJFu7TJoFyokg/KTEb0cuLqo4QKbF5P5XmfAAzoh7G1BW/9y50lKEEcJjQC26DKppTfHYz5eAp3+tXFNimB13eJJH5sqADQvuFrZbRo24fB3RSf77u3TSeQWU=" cache: directories: @@ -175,9 +177,11 @@ deploy: prerelease: true body: "View [Release Notes](${TAG_URI}/NEWS.md#${ANCHOR}) for flux-core ${TRAVIS_TAG}" api_key: - secure: I7ckZ7Ei9oLIe8WZ8OH3EgZz81IFCIekx+v/+g3sJa6q15URlfZhVVFtiUpsJRktHcb39AflWZiEIX+HdUZyXtuTt9IES1XBIKH7x/zUL0x6f1DZKAhBx9ktYzdO/M+SpmDUg6RYxcdjVmSHZ9u935TDo104U+dY0990ZSFrpco= + # Generate on github.com/settings/token personal access token and encrypt with + # travis encrypt -r flux-framework/repo_slug + secure: "dSZYBOVcI42xqVcjNTIymIpgbyuMquRxMcWDMplCxd6RzFLzwMkch+zJHDA4NvBma6tuemwnweGfsehRjjNu9Y3gyok6Tejwl8aURwt7i5u6baibmFXZNr33j4qS3GgEmygdFALyjj6fIvdbGD+jQxVNLbYkPgvbpekJwxw66gszKU3lujmcRQK3x0gHe65WqdLq6q0BcL2fttXIL3BleS1ac/cEya1IHfKMBw4Lnq3qrzh4vcB3FwdBJnw4D8JKFof/WpJYInDOtlufBxk0jagNyd/egK68O0aYnV1PNh3+goRIuGPTtEbRb8cjuNZ5ChR9Qed2z08es2ss96Q2ATnQfCbUxqzyYTiPqPlmrPHDRlFBjCHA3GtnKQzWHnOR5i6WWff4O4JHe4pg2AwSEkGQ/8sy81+r5LibLcbNK+NGQzBxxNnHTDx5bHPyN+Z2q6tLgNkD+5Tlfutjc1mk4np7kdiicFLIcVMWNMDm4YyMI6Y2OwQlMjkVRi1Z9RwUvAyp1ltw6FLQoLdMOfmnhrj65QLUoUuor7JIRPK4B5TYUjpSWnKd37MG5tkzrClmZ4iFIEB8/MY50Qy4Y7G1siuijgQoIOT1Z+8VUYL3snxDY6M1wl2KGpb3cU5Z/HP3AvX5jxLzqI+KQgttB0KLcHvA2Q/mth3rJPQ4CQY3+bM=" on: # Only deploy from travis builder with GITHUB_RELEASES_DEPLOY set condition: $GITHUB_RELEASES_DEPLOY = "t" tags: true - repo: flux-framework/flux-core + repo: flux-framework/flux-core-v0.11 From ab5d84cdea3da617c64444a9f43b74d0cfa7897c Mon Sep 17 00:00:00 2001 From: Mark Grondona Date: Thu, 18 Apr 2019 00:42:54 +0000 Subject: [PATCH 5/5] travis-ci: add -v0.11 prefix to -latest docker tag For builds on flux-core-v0.11 master, tag the docker images as flux-core:${IMAGE}-v0.11-latest, so as not to overwrite the flux-core unstable repo docker images. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8dc40fe655d5..db66fa44ecad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,6 +94,7 @@ env: global: - TAP_DRIVER_QUIET=1 - DOCKERREPO=fluxrm/flux-core + - DOCKER_STABLE_PREFIX=-v0.11 - DOCKER_USERNAME=travisflux # travis encrypt -r flux-framework/flux-core-v0.11 # DOCKER_PASSWORD=xxxx @@ -149,7 +150,7 @@ after_success: docker push ${TAGNAME} # If this is the bionic-base build, then also tag without image name: if echo "$TAGNAME" | grep -q "bionic-base"; then - t="${DOCKERREPO}:${TRAVIS_TAG:-latest}" + t="${DOCKERREPO}:${TRAVIS_TAG:${DOCKER_STABLE_PREFIX}-latest}" docker tag "$TAGNAME" ${t} && \ docker push ${t} fi