diff --git a/ci-templates/auto-rules/no-default.yml b/ci-templates/auto-rules/no-default.yml index 9646c7ba87e30acdfe87aa199594fd2e0096fd39..1012ebbeb3305e18bdbe066f7e7a1d836b377c3f 100644 --- a/ci-templates/auto-rules/no-default.yml +++ b/ci-templates/auto-rules/no-default.yml @@ -56,24 +56,24 @@ industrial_ci_noetic: industrial_kinetic_deploy: extends: .ddeploy - variables: - ROS_DISTRO: kinetic rules: - if: $DEPLOY && $DEFAULT_DISTRO == "kinetic" + exists: ddeploy.yaml - if: $DEPLOY && $BUILD_KINETIC + exists: ddeploy.yaml industrial_melodic_deploy: extends: .ddeploy - variables: - ROS_DISTRO: melodic rules: - if: $DEPLOY && $DEFAULT_DISTRO == "melodic" + exists: ddeploy.yaml - if: $DEPLOY && $BUILD_MELODIC + exists: ddeploy.yaml industrial_noetic_deploy: extends: .ddeploy - variables: - ROS_DISTRO: noetic rules: - if: $DEPLOY && $DEFAULT_DISTRO == "noetic" + exists: ddeploy.yaml - if: $DEPLOY && $BUILD_NOETIC + exists: ddeploy.yaml diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml index 4657031eb11249e7c9c1f5ee1837c6ae5da4e22c..b9c6251da4130e27be509c10e1302d471323de12 100644 --- a/ci-templates/industrial-ci-templates.yml +++ b/ci-templates/industrial-ci-templates.yml @@ -20,6 +20,7 @@ DOCKER_PUSH_REGISTRY: ${ARTIFACT_DOCKER_URL} DOCKER_PUSH_NAME: ${CI_PROJECT_NAME} DOCKER_PUSH_TAG: ${CI_COMMIT_REF_SLUG} + DDEPLOY_YAML: ddeploy.yaml before_script: - docker info - apk add --update python3 git py3-pip git-lfs