Skip to content

build(deps): fix quickstart image #3419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions projects/vdk-core/cicd/Dockerfile-vdk-base
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,18 @@ ENV VDK_VERSION $vdk_version
ARG vdk_version
ARG vdk_package
ARG pip_extra_index_url

# Install bash
RUN apt-get update && apt-get install -y bash && echo "Bash installed successfully" || echo "Bash installation failed"

# Set default shell to bash
SHELL ["/bin/bash", "-c"]

# Default command
CMD ["/bin/bash"]

# Force a snapshot with a no-op RUN command
RUN echo "Forcing snapshot"


RUN pip install --extra-index-url $pip_extra_index_url $vdk_package==$vdk_version
5 changes: 3 additions & 2 deletions projects/vdk-core/cicd/deploy-base-vdk-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@ echo "{\"auths\":{\"$VDK_DOCKER_REGISTRY_URL\":{\"username\":\"$VDK_DOCKER_REGIS

SCRIPT_DIR=$(dirname "$0")
DOCKERFILE_PATH="$SCRIPT_DIR/Dockerfile-vdk-base"
/kaniko/executor --force --single-snapshot \
/kaniko/executor --force \
--dockerfile="${DOCKERFILE_PATH}" \
--destination="${DOCKER_REGISTRY_IMAGE}:${VDK_VERSION}" \
--destination="${DOCKER_REGISTRY_IMAGE}:${BUILD_TYPE}" \
--build-arg=vdk_package="${VDK_PACKAGE}" \
--build-arg=vdk_version="${VDK_VERSION}" \
--build-arg=pip_extra_index_url="${PIP_EXTRA_INDEX_URL}" \
--build-arg=vdk_base_python_image="${VDK_BASE_PYTHON_IMAGE}"
--build-arg=vdk_base_python_image="${VDK_BASE_PYTHON_IMAGE}" \
--cache=false
2 changes: 1 addition & 1 deletion projects/vdk-core/src/vdk/api/plugin/plugin_input.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def set_properties_factory_method(
"""
Register properties implementation backend.
Properties API enable keeping state of a data job.
Default implementation is in-memory so it's strongly recommended to install vdk-properties plugin
Default implementation is in-memory, so it's strongly recommended to install vdk-properties plugin
which provides API based properties implementation

IPropertiesServiceClient is used as provides logic of how properties are persisted
Expand Down
6 changes: 4 additions & 2 deletions projects/vdk-plugins/.plugin-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
retry: !reference [.retry, retry_options]
rules: # we want to trigger build jobs if there are changes to this plugin,
# but not if there are changes to other plugins or the main directory
- if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
- if: '$CI_COMMIT_BRANCH == "main"'
changes:
- "projects/vdk-plugins/$PLUGIN_NAME/**/*"
artifacts:
Expand All @@ -38,7 +38,7 @@
USE_VDKCORE_DEV_VERSION: "yes"
extends: .build-plugin-dind
rules:
- if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
- if: '$CI_COMMIT_BRANCH == "main"'
changes:
- "projects/vdk-core/*"
- "projects/vdk-core/src/**/*"
Expand Down Expand Up @@ -74,6 +74,7 @@
- if: '$CI_COMMIT_BRANCH == "main"'
changes:
- "projects/vdk-plugins/$PLUGIN_NAME/**/*"
# - if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"'


.release-vdk-image:
Expand Down Expand Up @@ -102,3 +103,4 @@
- if: '$CI_COMMIT_BRANCH == "main"'
changes:
- "projects/vdk-plugins/$PLUGIN_NAME/**/*"
# - if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"'
14 changes: 8 additions & 6 deletions projects/vdk-plugins/quickstart-vdk/.plugin-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,18 @@ release-quickstart-vdk:
variables:
PLUGIN_NAME: quickstart-vdk
rules:
- if: '$CI_COMMIT_BRANCH == "main"'
changes: *test_quickstart_vdk_locations
# - if: '$CI_COMMIT_BRANCH == "main"'
# changes: *test_quickstart_vdk_locations
- if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"'
extends: .release-plugin

release-vdk-image-quickstart-vdk:
variables:
PLUGIN_NAME: quickstart-vdk
extends: .release-vdk-image
rules:
- if: '$CI_COMMIT_BRANCH == "main"'
changes: *test_quickstart_vdk_locations
- if: '$CI_PIPELINE_SOURCE == "schedule"'
when: never
# - if: '$CI_COMMIT_BRANCH == "main"'
# changes: *test_quickstart_vdk_locations
# - if: '$CI_PIPELINE_SOURCE == "schedule"'
# when: never
- if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"'
Loading