@@ -58,6 +58,22 @@ win_ssd_and_clone:
58
58
git reset --hard $CIRRUS_CHANGE_IN_REPO
59
59
fi
60
60
61
+ .jfrog__config_template : &JFROG_CONFIG_TEMPLATE
62
+ jfrog_config_script :
63
+ - $JF_ALIAS config add repox --artifactory-url "$ARTIFACTORY_URL" --access-token "$ARTIFACTORY_PRIVATE_ACCESS_TOKEN"
64
+ - $JF_ALIAS poetry-config --server-id-resolve repox --repo-resolve sonarsource-pypi
65
+ - $JF_ALIAS poetry install --build-name="$CIRRUS_REPO_NAME" --build-number="$CI_BUILD_NUMBER"
66
+
67
+ .jfrog_windows_config_template : &JFROG_WIN_CONFIG_TEMPLATE
68
+ env :
69
+ JF_ALIAS : " jf"
70
+ << : *JFROG_CONFIG_TEMPLATE
71
+
72
+ .jfrog_MAC_LINUX_config_template : &JFROG_MAC_LINUX_CONFIG_TEMPLATE
73
+ env :
74
+ JF_ALIAS : " jfrog"
75
+ << : *JFROG_CONFIG_TEMPLATE
76
+
61
77
poetry_win_install : &POETRY_WIN_INSTALL
62
78
<< : *WINDOWS_VM_DEFINITION
63
79
<< : *WIN_SSD_AND_CLONE
@@ -71,9 +87,7 @@ poetry_win_install: &POETRY_WIN_INSTALL
71
87
- source cirrus-env QA
72
88
- pip install poetry=="$POETRY_VERSION"
73
89
- source set_poetry_build_version "$CI_BUILD_NUMBER"
74
- - jf config add repox --artifactory-url "$ARTIFACTORY_URL" --access-token "$ARTIFACTORY_PRIVATE_ACCESS_TOKEN"
75
- - jf poetry-config --server-id-resolve repox --repo-resolve sonarsource-pypi
76
- - jf poetry install --build-name="$CIRRUS_REPO_NAME" --build-number="$CI_BUILD_NUMBER"
90
+ << : *JFROG_WIN_CONFIG_TEMPLATE
77
91
78
92
poetry_cache_template : &POETRY_CACHE
79
93
poetry_cache :
@@ -85,9 +99,7 @@ poetry_cache_template: &POETRY_CACHE
85
99
poetry_install_script :
86
100
- source set_poetry_build_version "$CI_BUILD_NUMBER"
87
101
- echo "PROJECT_VERSION=$PROJECT_VERSION" >> $CIRRUS_ENV
88
- - jfrog config add repox --artifactory-url "$ARTIFACTORY_URL" --access-token "$ARTIFACTORY_PRIVATE_ACCESS_TOKEN"
89
- - jfrog poetry-config --server-id-resolve repox --repo-resolve sonarsource-pypi
90
- - jfrog poetry install --build-name="$CIRRUS_REPO_NAME" --build-number="$CI_BUILD_NUMBER"
102
+ << : *JFROG_MAC_LINUX_CONFIG_TEMPLATE
91
103
92
104
.poetry_linux_template : &POETRY_LINUX_TEMPLATE
93
105
<< : *POETRY_TEMPLATE
@@ -102,9 +114,7 @@ poetry_cache_template: &POETRY_CACHE
102
114
poetry_install_script :
103
115
- brew install poetry
104
116
- poetry config keyring.enabled false # Keyring is locked in macOS VM and not needed for downloading dependencies
105
- - jfrog config add repox --artifactory-url "$ARTIFACTORY_URL" --access-token "$ARTIFACTORY_PRIVATE_ACCESS_TOKEN"
106
- - jfrog poetry-config --server-id-resolve repox --repo-resolve sonarsource-pypi
107
- - jfrog poetry install --build-name="$CIRRUS_REPO_NAME" --build-number="$CI_BUILD_NUMBER"
117
+ << : *JFROG_MAC_LINUX_CONFIG_TEMPLATE
108
118
109
119
macos_worker_template : &MACOS_WORKER_DEFINITION
110
120
persistent_worker :
@@ -159,13 +169,14 @@ documentation_task:
159
169
- poetry run python tools/generate_cli_documentation.py
160
170
- git diff --exit-code CLI_ARGS.md
161
171
162
- # For NEXT analysis we don't need to set the build versions
163
172
analysis_linux_task :
164
173
<< : *POETRY_CACHE
165
174
eks_container :
166
175
<< : *LINUX_CONTAINER_DEFINITION
167
176
alias : analysis
168
177
name : " NEXT Analysis"
178
+ # For NEXT analysis we don't need to set the build versions, but we still need to access jfrog to recover the dependencies
179
+ << : *JFROG_MAC_LINUX_CONFIG_TEMPLATE
169
180
analysis_script :
170
181
- poetry install
171
182
- poetry run pytest --cov-report=xml:coverage.xml --cov-config=pyproject.toml --cov=src --cov-branch tests
0 commit comments