Revert "Release v2.2.0-beta (ligato#1434)"

This reverts commit 2c193f2.

.dockerignore

@@ -10,7 +10,4 @@ examples/
 k8s/
 cmd/agentctl/agentctl
 cmd/vpp-agent/vpp-agent
-cmd/vpp-agent-ctl/vpp-agent-ctl
-docker/dev/build.sh
-docker/prod/build.sh
-tests/perf/grpc-perf/grpc-perf
+cmd/vpp-agent-ctl/vpp-agent-ctl

.travis.yml

@@ -4,72 +4,47 @@ sudo: required
 
 language: go
 go:
-  - "1.12.x"
+  - "1.11.x"
 
-go_import_path: github.com/ligato/vpp-agent
+addons:
+  apt:
+    packages:
+      - npm
 
-services:
-  - docker
+go_import_path: github.com/ligato/vpp-agent
 
 git:
-  depth: 5
+  depth: 10
   submodules: false
 
 cache:
   directories:
-    - ${HOME}/.cache
-
-install: true
-
-stages:
-  - Check
-  - Test
-  - Build
-  - Integration
-
-jobs:
-  include:
-    - stage: Check
-      language: shell
-      name: "Check formatting"
-      addons:
-        apt:
-          packages:
-            - npm
-      script:
-        - make yamllint
-        - make check-links || true
-    - name: "Go dependency check"
-      script: make dep-check
-
-    - stage: Test
-      name: "Code linter"
-      script: make lint
-    - name: "Unit tests"
-      before_script:
-        - go get github.com/mattn/goveralls
-      script: make test-cover
-      after_success:
-        - goveralls -coverprofile=/tmp/coverage.out -service=travis-ci
-
-    - stage: Build
-      script:
-        - make cmd
-        - make examples
-
-    - stage: Integration
-      env: VPP_VERSION=1904
-      script:
-        - make verify-binapi
-        - make integration-tests
-    - env: VPP_VERSION=1908
-      script:
-        - make verify-binapi
-        - make integration-tests
-    - env: VPP_VERSION=1901
-      script:
-        - make verify-binapi
-        - make integration-tests
+    - $HOME/.cache/go-build
+    - $HOME/build-cache
+    - $HOME/.npm
+    - $(npm config get prefix)/lib/node_modules
+
+env:
+  - GO_BUILD_TAGS=mockvpp
+
+before_install:
+  - make travis
+  - make get-linkcheck
+  - make get-linters
+  - make get-dep
+  - go get github.com/mattn/goveralls
+
+script:
+  - make yamllint
+  - make check-links || true
+  - make lint
+  - make dep-check
+  - make verify-binapi
+  - make
+  - make test-cover
+
+after_success:
+  - goveralls -coverprofile=/tmp/coverage.out -service=travis-ci
 
 notifications:
   slack:

CHANGELOG.md

@@ -4,7 +4,6 @@
 
 ## Release Notes
 
-- [v2.2.0-beta](#v2.2.0-beta)
 - [v2.1.0](#v2.1.0)
   - [v2.1.1](#v2.1.1)
 - [v2.0.0](#v2.0.0)
@@ -45,70 +44,6 @@ RELEASE CHANGELOG TEMPLATE:
 -->
 
 
-<a name="v2.2.0-beta"></a>
-# [2.2.0-beta](https://github.com/ligato/vpp-agent/compare/v2.1.1...v2.2.0-beta) (2019-08-09)
-
-### Compatibility
-- **VPP 19.08** (rc1)
-- **VPP 19.04** (default)
-- **VPP 19.01** (backward compatible)
-
-### Bug Fixes
-* Fixed SRv6 localsid delete case for non-zero VRF tables.
-* Fixed interface IPv6 detection in the descriptor.
-* Various bugs fixed in KV scheduler TXN post-processing.
-* Interface plugin config names fixed, no stats publishers are now used by default. Instead, datasync is used (by default ETCD, Redis and Consul).
-* Rx-placement and rx-mode is now correctly dependent on interface link state.
-* Fixed crash for iptables rulechain with default microservice.
-* Punt dump fixed in all supported VPP versions.
-* Removal of registered punt sockets fixed after a resync.
-* Punt socket paths should no longer be unintentionally recreated.
-* IP redirect is now correctly dependent on RX interface.
-* Fixed IPSec security association configuration for tunnel mode.
-* Fixed URL for VPP metrics in telemetry plugin
-* Routes are now properly dependent on VRF.
-
-### New Features
-* Defined new environment variable `DISABLE_INTERFACE_STATS` to generally disable interface plugin stats.
-* Defined new environment variable `RESYNC_TIMEOU` to override default resync timeout. 
-* Added [ETCD ansible python plugin][ansible] with example playbook. Consult [readme](ansible/README.md) for more information.
-
-### Improvements
-* [govppmux-plugin][govppmux-plugin]
-  - GoVPPMux stats can be read with rest under path `/govppmux/stats`.
-  - Added disabling of interface stats via the environment variable `DISABLE_INTERFACE_STATS`.
-  - Added disabling of interface status publishing via environment variable `DISABLE_STATUS_PUBLISHING`.
-* [kv-scheduler][kv-scheduler]
-  - Added some more performance improvements.
-  - The same key can be no more matched by multiple descriptors.
-* [abf-plugin][vpp-abf-plugin]
-  - ABF plugin was added to config data model and is now initialized in configurator.  
-* [if-plugin][vpp-interface-plugin]
-  - Interface rx-placement and rx-mode was enhanced and now allows per-queue configuration.
-  - Added [examples](examples/kvscheduler/rxplacement) for rx-placement and rx-mode.
-* [nat-plugin][vpp-nat-plugin]
-  - NAT example updated for VPP 19.04
-* [l3-plugin][vpp-l3-plugin]  
-  - Route keys were changed to prevent collisions with some types of configuration. Route with outgoing interface now contains the interface name in the key.
-  - Added support for DHCP proxy. A new descriptor allows calling CRUD operations to VPP DHCP proxy servers.
-* [punt-plugin][vpp-punt-plugin]
-  - Added support for Punt exceptions.  
-  - IP redirect dump was implemented for VPP 19.08.
-* [Telemetry][vpp-telemetry]
-  - Interface metrics added to telemetry plugin. Note that the URL for prometheus export was changed to `/metrics/vpp`.
-  - Plugin configuration file now has an option to skip certain metrics.
-* [rest-plugin][rest-plugin]
-  - Added support for IPSec plugin
-  - Added support for punt plugin  
-* [agentctl][agentctl]
-  - We continuously update the new CTL tool. Various bugs were fixed some new features added.
-  - Added new command `import` which can import configuration from file. 
-
-### Docker Images
-* The supervisor was replaced with VPP-Agent init plugin. 
-* Images now use pre-built VPP images from [ligato/vpp-base](https://github.com/ligato/vpp-base)
-
-
 <a name="v2.1.1"></a>
 # [2.1.1](https://github.com/ligato/vpp-agent/compare/v2.1.0...v2.1.1) (2019-04-05)
 
@@ -894,7 +829,6 @@ Data replication and events:
   - remote client - for remote configuration of VPP Agent (while integrating for example with control plane)
 
 [agentctl]: cmd/agentctl
-[ansible]: ansible
 [configurator-plugin]: plugins/configurator
 [consul]: https://www.consul.io/
 [contiv-vpp1810]: https://github.com/vpp-dev/vpp/tree/stable-1801-contiv

Gopkg.toml

@@ -12,8 +12,8 @@ required = [
 # Constraints
 
 [[constraint]]
-  branch = "dev"
   name = "github.com/ligato/cn-infra"
+  version = "2.1.0"
 
 [[constraint]]
   branch = "master"