From 1b0b39d2f51a9e6072eaff5c35b0a7523e3a38d7 Mon Sep 17 00:00:00 2001 From: dougbtv Date: Thu, 21 Mar 2019 11:56:10 -0400 Subject: [PATCH] [travis] Updates Travis to tag master builds as :latest, and adds version tagged images to daemonsets --- .goreleaser.yml | 2 ++ .travis.yml | 14 +++++++++----- images/multus-crio-daemonset.yml | 2 +- images/multus-daemonset.yml | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index d9101dd7..fad4443f 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -20,3 +20,5 @@ snapshot: name_template: "{{ .Tag }}-snapshot" release: draft: true +changelog: + skip: true diff --git a/.travis.yml b/.travis.yml index 2d4d757c..81b5b7da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ script: deploy: # Release on versioned tag (e.g. v1.0) - provider: script - skip_cleanup: true + #skip_cleanup: true script: curl -sL https://git.io/goreleaser | bash on: tags: true @@ -56,13 +56,16 @@ deploy: condition: "$TRAVIS_TAG =~ ^v[0-9].*$" # Push images to Dockerhub on tag - provider: script + skip_cleanup: true script: > bash -c ' docker tag nfvpe/multus nfvpe/multus:$TRAVIS_TAG; + docker tag nfvpe/multus nfvpe/multus:stable; docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASS"; - docker push nfvpe/multus; + docker push nfvpe/multus; + docker push nfvpe/multus:stable; docker push nfvpe/multus:$TRAVIS_TAG; - echo foo' + echo done' on: tags: true all_branches: true @@ -75,8 +78,9 @@ deploy: bash -c ' docker tag nfvpe/multus nfvpe/multus:snapshot; docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASS"; - docker push nfvpe/multus:snapshot; - echo foo' + docker push nfvpe/multus:snapshot; + docker push nfvpe/multus:latest; + echo done' after_success: # put build tgz to bintray diff --git a/images/multus-crio-daemonset.yml b/images/multus-crio-daemonset.yml index c3f4cb74..70760a71 100644 --- a/images/multus-crio-daemonset.yml +++ b/images/multus-crio-daemonset.yml @@ -130,7 +130,7 @@ spec: serviceAccountName: multus containers: - name: kube-multus - image: nfvpe/multus:latest + image: nfvpe/multus:v3.2 command: ["/entrypoint.sh"] args: - "--multus-conf-file=/tmp/multus-conf/70-multus.conf" diff --git a/images/multus-daemonset.yml b/images/multus-daemonset.yml index 470308f7..1c1c5b85 100644 --- a/images/multus-daemonset.yml +++ b/images/multus-daemonset.yml @@ -130,7 +130,7 @@ spec: serviceAccountName: multus containers: - name: kube-multus - image: nfvpe/multus:latest + image: nfvpe/multus:v3.2 command: ["/entrypoint.sh"] args: - "--multus-conf-file=/tmp/multus-conf/70-multus.conf"