Skip to content

Commit 742b7fc

Browse files
vins01-4scienceMicheleboychuk
vins01-4science
authored and
Micheleboychuk
committed
Merged in task/dspace-cris-2024_02_x/DSC-2809 (pull request DSpace#5728)
[DSC-2809] Approved-by: Mykhaylo Boychuk
2 parents 49a21c4 + d941f5e commit 742b7fc

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

‎bitbucket-pipelines.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,11 @@ definitions:
202202
- export HASH_COMMIT=${BITBUCKET_COMMIT:0:8}
203203
- export BRANCH_NAME=$(echo "$BITBUCKET_BRANCH" | tr '[:upper:]' '[:lower:]' | sed 's|/|--|g')
204204
- export BRANCH_FILE=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
205-
- git clone https://x-token-auth:${DSPACE_VALUES_ACCESS_TOKEN}@${DSPACE_VALUES_REPO}
205+
- git clone https://${BB_USER}:${BB_USER_TOKEN}@${DSPACE_VALUES_REPO}
206206
- cd dspace-values
207207
- '[ -f "dev/${BRANCH_FILE}" ] && sed -i "/^rest:/,/^[^ ]/s/\(tag: \).*/\1${BRANCH_NAME}-${HASH_COMMIT}/" "dev/${BRANCH_FILE}" && sed -i "s/^\([[:space:]]*replicaCount:\) 0/\1 1/" "dev/${BRANCH_FILE}"'
208-
- git config --global user.email "${BB_USER}"
209-
- git config --global user.name "${BB_EMAIL}"
208+
- git config --global user.email "${BB_EMAIL}"
209+
- git config --global user.name "${BB_USER}"
210210
- git commit -am "Update TAG with ${BRANCH_NAME}-${HASH_COMMIT}" || echo "No changes to commit"
211211
- git push
212212

@@ -217,11 +217,11 @@ definitions:
217217
- export HASH_COMMIT=${BITBUCKET_COMMIT:0:8}
218218
- export BRANCH_NAME=$(echo "$BITBUCKET_BRANCH" | tr '[:upper:]' '[:lower:]' | sed 's|/|--|g')
219219
- export BRANCH_FILE=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
220-
- git clone https://x-token-auth:${DSPACE_VALUES_ACCESS_TOKEN}@${DSPACE_VALUES_REPO}
220+
- git clone https://${BB_USER}:${BB_USER_TOKEN}@${DSPACE_VALUES_REPO}
221221
- cd dspace-values
222222
- '[ -f "staging/${BRANCH_FILE}" ] && sed -i "/^rest:/,/^[^ ]/s/\(tag: \).*/\1${BRANCH_NAME}-${HASH_COMMIT}/" "staging/${BRANCH_FILE}" && sed -i "s/^\([[:space:]]*replicaCount:\) 0/\1 1/" "staging/${BRANCH_FILE}"'
223-
- git config --global user.email "${BB_USER}"
224-
- git config --global user.name "${BB_EMAIL}"
223+
- git config --global user.email "${BB_EMAIL}"
224+
- git config --global user.name "${BB_USER}"
225225
- git commit -am "Update TAG with ${BRANCH_NAME}-${HASH_COMMIT}" || echo "No changes to commit"
226226
- git push
227227

@@ -232,11 +232,11 @@ definitions:
232232
- export HASH_COMMIT=${BITBUCKET_COMMIT:0:8}
233233
- export BRANCH_NAME=$(echo "$BITBUCKET_BRANCH" | tr '[:upper:]' '[:lower:]' | sed 's|/|--|g')
234234
- export BRANCH_FILE=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
235-
- git clone https://x-token-auth:${DSPACE_VALUES_ACCESS_TOKEN}@${DSPACE_VALUES_REPO}
235+
- git clone https://${BB_USER}:${BB_USER_TOKEN}@${DSPACE_VALUES_REPO}
236236
- cd dspace-values
237237
- '[ -f */test/"${BRANCH_FILE}" ] && sed -i "/^rest:/,/^[^ ]/s/\(tag: \).*/\1${BRANCH_NAME}-${HASH_COMMIT}/" */test/"${BRANCH_FILE}" && sed -i "s/^\([[:space:]]*replicaCount:\) 0/\1 1/" */test/"${BRANCH_FILE}"'
238-
- git config --global user.email "${BB_USER}"
239-
- git config --global user.name "${BB_EMAIL}"
238+
- git config --global user.email "${BB_EMAIL}"
239+
- git config --global user.name "${BB_USER}"
240240
- git commit -am "Update TAG with ${BRANCH_NAME}-${HASH_COMMIT}" || echo "No changes to commit"
241241
- git push
242242

@@ -247,11 +247,11 @@ definitions:
247247
- export HASH_COMMIT=${BITBUCKET_COMMIT:0:8}
248248
- export BRANCH_NAME=$(echo "$BITBUCKET_BRANCH" | tr '[:upper:]' '[:lower:]' | sed 's|/|--|g')
249249
- export BRANCH_FILE=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
250-
- git clone https://x-token-auth:${DSPACE_VALUES_ACCESS_TOKEN}@${DSPACE_VALUES_REPO}
250+
- git clone https://${BB_USER}:${BB_USER_TOKEN}@${DSPACE_VALUES_REPO}
251251
- cd dspace-values
252252
- '[ -f "dev/${BRANCH_FILE}" ] && sed -i "s/^\([[:space:]]*replicaCount:\) 0/\1 1/" "dev/${BRANCH_FILE}"'
253-
- git config --global user.email "${BB_USER}"
254-
- git config --global user.name "${BB_EMAIL}"
253+
- git config --global user.email "${BB_EMAIL}"
254+
- git config --global user.name "${BB_USER}"
255255
- git commit -am "Enable dev environment for ${BRANCH_NAME}" || echo "No changes to commit"
256256
- git push
257257

@@ -262,11 +262,11 @@ definitions:
262262
- export HASH_COMMIT=${BITBUCKET_COMMIT:0:8}
263263
- export BRANCH_NAME=$(echo "$BITBUCKET_BRANCH" | tr '[:upper:]' '[:lower:]' | sed 's|/|--|g')
264264
- export BRANCH_FILE=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
265-
- git clone https://x-token-auth:${DSPACE_VALUES_ACCESS_TOKEN}@${DSPACE_VALUES_REPO}
265+
- git clone https://${BB_USER}:${BB_USER_TOKEN}@${DSPACE_VALUES_REPO}
266266
- cd dspace-values
267267
- '[ -f "staging/${BRANCH_FILE}" ] && sed -i "s/^\([[:space:]]*replicaCount:\) 0/\1 1/" "staging/${BRANCH_FILE}"'
268-
- git config --global user.email "${BB_USER}"
269-
- git config --global user.name "${BB_EMAIL}"
268+
- git config --global user.email "${BB_EMAIL}"
269+
- git config --global user.name "${BB_USER}"
270270
- git commit -am "Enable staging environment for ${BRANCH_NAME}" || echo "No changes to commit"
271271
- git push
272272

@@ -277,11 +277,11 @@ definitions:
277277
- export HASH_COMMIT=${BITBUCKET_COMMIT:0:8}
278278
- export BRANCH_NAME=$(echo "$BITBUCKET_BRANCH" | tr '[:upper:]' '[:lower:]' | sed 's|/|--|g')
279279
- export BRANCH_FILE=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
280-
- git clone https://x-token-auth:${DSPACE_VALUES_ACCESS_TOKEN}@${DSPACE_VALUES_REPO}
280+
- git clone https://${BB_USER}:${BB_USER_TOKEN}@${DSPACE_VALUES_REPO}
281281
- cd dspace-values
282282
- '[ -f */test/"${BRANCH_FILE}" ] && sed -i "s/^\([[:space:]]*replicaCount:\) 0/\1 1/" */test/"${BRANCH_FILE}"'
283-
- git config --global user.email "${BB_USER}"
284-
- git config --global user.name "${BB_EMAIL}"
283+
- git config --global user.email "${BB_EMAIL}"
284+
- git config --global user.name "${BB_USER}"
285285
- git commit -am "Enable test environment for ${BRANCH_NAME}" || echo "No changes to commit"
286286
- git push
287287

0 commit comments

Comments
 (0)