Resolve "Allow a way of testing melodic pipeline"

Closes #33 (closed)

.gitlab-industrial-ci-kinetic-with-rosinstall.yml

@@ -40,19 +40,23 @@ industrial_ci_kinetic:
   variables:
     ROS_DISTRO: kinetic
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
-  except:
-    - tags
-    - /^melodic-.*/
+  rules:
+    - if: '$CI_COMMIT_REF_NAME =~ /^melodic-.*/'
+      when: never
+    - if: $CI_COMMIT_TAG
+      when: never
+    when: always
 
 industrial_ci_melodic:
   extends: .industrial_ci
   variables:
     ROS_DISTRO: melodic
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
-  only:
-    - /^melodic-.*/
-  except:
-    - tags
+  rules:
+    - if: '$CI_COMMIT_REF_NAME =~ /^melodic-.*/'
+      when: always
+    - if: $CI_COMMIT_TAG
+      when: never
 
 industrial_ci_kinetic_deploy:
   extends: .industrial_ci