temp: temporary EF CI variables

Signed-off-by: sebastien.heurtematte <sebastien.heurtematte@eclipse-foundation.org>

.gitlab-ci.yml

@@ -45,7 +45,7 @@ workflow:
     # To use these pipelines, you must either enable Docker registry or set
     # CI_REGISTRY_IMAGE variable to an external Docker registry which hosts the
     # needed container images
-    - if: $CI_REGISTRY_IMAGE == null
+    - if: $CI_EF_REGISTRY_IMAGE == null
       when: never
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
     - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
@@ -82,9 +82,9 @@ variables:
   # But on the other hand, forking meta-openharmony to a GitLab instance with
   # Docker registry support should simply work, automatically building and using
   # the registry of the project/fork.
-  BITBAKE_BUILDER: "$CI_REGISTRY_IMAGE/bitbake-builder"
+  BITBAKE_BUILDER: "$CI_EF_REGISTRY_IMAGE/bitbake-builder"
   # And same for openharmony-builder
-  OPENHARMONY_BUILDER: "$CI_REGISTRY_IMAGE/openharmony-builder"
+  OPENHARMONY_BUILDER: "$CI_EF_REGISTRY_IMAGE/openharmony-builder"
 
 stages:
   - container

.gitlab-ci/container.yml

@@ -26,28 +26,28 @@ variables:
     CONTAINER_DOCKERFILE: Dockerfile
     SERVICE_ADDRESS: "tcp://buildkitd.foundation-internal-infra-buildkitd:1234"
   script:
-    - test -n "$CI_REGISTRY" || (
-          echo "CI_REGISTRY not provided. Docker registry deployment can not continue."
+    - test -n "$CI_EF_REGISTRY" || (
+          echo "CI_EF_REGISTRY not provided. Docker registry deployment can not continue."
           && exit 1 )
-    - test -n "$CI_REGISTRY_IMAGE" || (
-          echo "CI_REGISTRY_IMAGE not provided. Docker registry deployment can not continue."
+    - test -n "$CI_EF_REGISTRY_IMAGE" || (
+          echo "CI_EF_REGISTRY_IMAGE not provided. Docker registry deployment can not continue."
           && exit 1 )
-    - test -n "$CI_REGISTRY_USER" || (
-          echo "CI_REGISTRY_USER not provided. Docker registry deployment can not continue."
+    - test -n "$CI_EF_REGISTRY_USER" || (
+          echo "CI_EF_REGISTRY_USER not provided. Docker registry deployment can not continue."
           && exit 1 )
-    - test -n "$CI_REGISTRY_PASSWORD" || (
-          echo "CI_REGISTRY_PASSWORD not provided. Docker registry deployment can not continue."
+    - test -n "$CI_EF_REGISTRY_PASSWORD" || (
+          echo "CI_EF_REGISTRY_PASSWORD not provided. Docker registry deployment can not continue."
           && exit 1 )
     - set -xe
     - CONTEXT="$CI_PROJECT_DIR/.gitlab-ci/container/$CONTAINER_PATH"
     - DOCKERFILE="$CONTEXT/$CONTAINER_DOCKERFILE"
     - if [ -n "$CONTAINER_FROM" ] ; then
-        sed -e "s|^FROM .*|FROM $CI_REGISTRY_IMAGE/$CONTAINER_FROM:$CONTAINER_VERSION|"
+        sed -e "s|^FROM .*|FROM $CI_EF_REGISTRY_IMAGE/$CONTAINER_FROM:$CONTAINER_VERSION|"
           -i "$DOCKERFILE" ;
       fi
     - |
       export HOME=$CI_PROJECT_DIR
-      crane auth login "$CI_REGISTRY" --username "$CI_REGISTRY_USER" --password "$CI_REGISTRY_PASSWORD"
+      crane auth login "$CI_EF_REGISTRY" --username "$CI_EF_REGISTRY_USER" --password "$CI_EF_REGISTRY_PASSWORD"
       BUILD_DATE="$(date '+%FT%T%z' | sed -E -n 's/(\+[0-9]{2})([0-9]{2})$/\1:\2/p')" #rfc 3339 date
       BUILD_TITLE=$(echo "$CI_PROJECT_TITLE" | tr " " "_")
       IMAGE_ANNOTATIONS="annotation.build-date=$BUILD_DATE,"
@@ -63,7 +63,7 @@ variables:
       IMAGE_ANNOTATIONS+="annotation.org.opencontainers.image.description=$BUILD_TITLE,"
       IMAGE_ANNOTATIONS+="annotation.org.opencontainers.image.documentation=$CI_PROJECT_URL,"
       IMAGE_ANNOTATIONS+="annotation.org.opencontainers.image.licenses=$CI_PROJECT_URL,"
-      IMAGE_ANNOTATIONS+="annotation.org.opencontainers.image.ref.name=$CI_REGISTRY:$CI_COMMIT_REF_NAME,"
+      IMAGE_ANNOTATIONS+="annotation.org.opencontainers.image.ref.name=$CI_EF_REGISTRY:$CI_COMMIT_REF_NAME,"
       IMAGE_ANNOTATIONS+="annotation.org.opencontainers.image.revision=$CI_COMMIT_SHA,"
       IMAGE_ANNOTATIONS+="annotation.org.opencontainers.image.source=$CI_PROJECT_URL,"
       IMAGE_ANNOTATIONS+="annotation.org.opencontainers.image.title=$BUILD_TITLE,"
@@ -72,7 +72,7 @@ variables:
       IMAGE_ANNOTATIONS+="annotation.org.opencontainers.image.version=$CI_COMMIT_TAG,"
       IMAGE_ANNOTATIONS+="annotation.vcs-url=$CI_PROJECT_URL"
 
-      echo "Building and shipping image to $CI_REGISTRY"
+      echo "Building and shipping image to $CI_EF_REGISTRY"
       OUTPUT="$CONTAINER_NAME.tar"
       buildctl --addr="$SERVICE_ADDRESS" \
         build \
@@ -81,10 +81,11 @@ variables:
           --local context="$CONTEXT" \
           --local dockerfile="$CONTEXT" \
           --output "type=oci,$IMAGE_ANNOTATIONS,dest=$OUTPUT"
-      crane push "$OUTPUT" "$CI_REGISTRY_IMAGE/$CONTAINER_NAME"
-      crane tag "$CI_REGISTRY_IMAGE/$CONTAINER_NAME" "$CONTAINER_VERSION"
+      crane push "$OUTPUT" "$CI_EF_REGISTRY_IMAGE/$CONTAINER_NAME"
+      crane tag "$CI_EF_REGISTRY_IMAGE/$CONTAINER_NAME" "$CONTAINER_VERSION"    
   rules:
-    - changes:
+    - if: $CI_EF_REGISTRY && $CI_EF_REGISTRY_USER && $CI_EF_REGISTRY_PASSWORD && $CI_EF_REGISTRY_IMAGE
+      changes:
         - .gitlab-ci/container.yml
         - .gitlab-ci/container/$CONTAINER_PATH/**