Resolve "Update deprecated deploy job"

Closes #38 (closed)

ci-templates/industrial-ci-templates.yml

@@ -17,22 +17,9 @@
 .ddeploy:
   stage: build
   variables:
-    DOCKER_BASE_REGISTRY: tecnalia-robotics-docker.artifact.tecnalia.com
-    DOCKER_BASE_USER: ${ARTIFACT_CI_USER}
-    DOCKER_BASE_TOKEN: ${ARTIFACT_CI_TOKEN}
-    DOCKER_BASE_NAME: flexbotics-base-devel
-    DOCKER_BASE_TAG: ${ROS_DISTRO}
-    DOCKER_PUSH_REGISTRY: tecnalia-robotics-docker.artifact.tecnalia.com
-    DOCKER_PUSH_USER: ${ARTIFACT_CI_USER}
-    DOCKER_PUSH_TOKEN: ${ARTIFACT_CI_TOKEN}
+    DOCKER_PUSH_REGISTRY: ${ARTIFACT_DOCKER_URL}
     DOCKER_PUSH_NAME: ${CI_PROJECT_NAME}
     DOCKER_PUSH_TAG: ${CI_COMMIT_REF_SLUG}
-    DDEPLOY_SOURCE: .
-    DDEPLOY_EXTRA_SOURCE: /tmp/empty.rosinstall
-    DDEPLOY_BEFORE_SCRIPT: ""
-    DDEPLOY_AFTER_SCRIPT: ""
-    DDEPLOY_CMD: "$${SHELL}"
-    DDEPLOY_EXTRA_ARGS: ""
   before_script:
     - docker info
     - apk add --update python3 git py3-pip git-lfs
@@ -49,22 +36,15 @@
     - echo https://$ARTIFACT_CI_USER:$ARTIFACT_CI_TOKEN@artifact.tecnalia.com > ~/.git-credentials
     # install ddeploy
     - pip install git+ssh://git@git.code.tecnalia.com/tecnalia_robotics/flexbotics/flexbotics_utils/ddeploy.git
-    - docker login ${DOCKER_BASE_REGISTRY} -u ${DOCKER_BASE_USER} -p ${DOCKER_BASE_TOKEN}
+    - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
   script:
-    - echo "[]" > /tmp/empty.rosinstall
-    - >-
-      ddeploy
-      --project-sources ${DDEPLOY_SOURCE}
-      --project-sources ${DDEPLOY_EXTRA_SOURCE}
-      --project-name ${DOCKER_PUSH_NAME}
-      --ros-distro ${ROS_DISTRO}
-      --image-name ${DOCKER_PUSH_REGISTRY}/${DOCKER_PUSH_NAME}:${DOCKER_PUSH_TAG}
-      --base-image ${DOCKER_BASE_REGISTRY}/${DOCKER_BASE_NAME}:${DOCKER_BASE_TAG}
-      --before-script "${DDEPLOY_BEFORE_SCRIPT}"
-      --after-script "${DDEPLOY_AFTER_SCRIPT}"
-      --cmd "${DDEPLOY_CMD}"
-      ${DDEPLOY_EXTRA_ARGS}
-    - docker tag ${DOCKER_PUSH_REGISTRY}/${DOCKER_PUSH_NAME}:${DOCKER_PUSH_TAG} ${DOCKER_PUSH_REGISTRY}/${DOCKER_PUSH_NAME}:latest
-    - docker login ${DOCKER_PUSH_REGISTRY} -u ${DOCKER_PUSH_USER} -p ${DOCKER_PUSH_TOKEN}
+    # Run ddeploy
+    - ddeploy --yaml ${DDEPLOY_YAML}
+    # Get ID of image created by ddeploy
+    - DOCKER_ID=$$(docker images --format='{{.ID}}' | head -1)
+    # Tag and push
+    - docker tag $${DOCKER_ID} ${DOCKER_PUSH_REGISTRY}/${DOCKER_PUSH_NAME}:${DOCKER_PUSH_TAG}
     - docker push ${DOCKER_PUSH_REGISTRY}/${DOCKER_PUSH_NAME}:${DOCKER_PUSH_TAG}
+    # Tag and push latest
+    - docker tag $${DOCKER_ID} ${DOCKER_PUSH_REGISTRY}/${DOCKER_PUSH_NAME}:latest
     - docker push ${DOCKER_PUSH_REGISTRY}/${DOCKER_PUSH_NAME}:latest