gitlab ci: always run build-and-test

Change-Id: I90f84ceac4eb7703951a6860146aed3aa5db941f
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 137a62d..7393e41 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,13 +18,6 @@
   PERL5LIB: ./perl5/lib/perl5
 
 build-and-test:
-  rules:
-    - if: $CI_COMMIT_TAG =~ /.+/
-      variables:
-        VID: $CI_COMMIT_TAG
-    - when: manual
-      variables:
-        VID: $CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
   stage: build
   cache:
     # Cache is shared between branches, but has a unique cache per job.