Skip to content
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.

Sign up for GitHub

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

vdk-quickstart: remove use of global varaibles in CI #1726

Merged
merged 2 commits into from
Mar 9, 2023
Merged

vdk-quickstart: remove use of global varaibles in CI #1726

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a07c767
vdk-quickstart: remove use of global varaibles in CI
antoniivanov Mar 9, 2023
d2f7400
Merge branch 'main' into person/aivanov/vdk-quickstart
antoniivanov Mar 9, 2023
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
3 changes: 2 additions & 1 deletion projects/vdk-plugins/.plugin-common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
extends: .build-plugin

.release-plugin:
image: "python:3.10"
stage: release
before_script:
- export VDK_PATCH_VERSION=${CI_PIPELINE_ID}
Expand Down Expand Up @@ -89,7 +90,7 @@
- echo "Build and release vdk image of plugin $PLUGIN_NAME"
- cd $PLUGIN_NAME/ || exit 1
- sed -ri "s/__version__ = \"([[:digit:]]\.[[:digit:]]\.).*\"$/__version__ = \"\1${VDK_PATCH_VERSION}\"/g" setup.py
- apk add --no-cache git bash python3
- apk add --no-cache git bash python3 py3-pip
- python3 -V
- python3 -m pip install -U setuptools configparser
- export VDK_PACKAGE=$(python3 setup.py --name)
Expand Down
8 changes: 1 addition & 7 deletions projects/vdk-plugins/quickstart-vdk/.plugin-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
# Copyright 2021-2023 VMware, Inc.
# SPDX-License-Identifier: Apache-2.0

image: "python:3.7"

variables:
DOCKER_HOST: tcp://localhost:2375
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: ""

# Add all quickstart-vdk dependencies locations which trigger the dependency release when changed.
# In this way, quickstart-vdk will always be tested before one or more dependencies are changed, and
# this is important since quickstart-vdk has unpinned dependencies and when they are upgraded,
Expand Down Expand Up @@ -78,6 +71,7 @@ quickstart-vdk-release-candidate-base-image:
extends: .release-vdk-image

quickstart-vdk-release-acceptance-test:
image: "python:3.10"
stage: pre_release_test
before_script:
- export VDK_PATCH_VERSION=${CI_PIPELINE_ID}.dev${CI_PIPELINE_IID}
Expand Down