Skip to content

Commit c3ddce6

Browse files
committed
Merge branch 'topic/eng/projects/7' into 'master'
Remove internal URLs See merge request eng/das/cov/gnatcoverage!717 Part of eng/projects/issues#7
2 parents 8eeaf55 + ddc8d90 commit c3ddce6

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ variables:
77
PACKAGE_BASE_NAME: gnatcoverage.tar.gz
88
PACKAGE_ABSOLUTE_NAME: $CI_PROJECT_DIR/$PACKAGE_BASE_NAME
99
GITLAB_REMOTE: "https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/"
10-
PIP_INDEX_URL: "https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.adacore-it.com/api/v4/projects/202/packages/pypi/simple"
1110

1211
include:
1312
#TODO: workaround to allow dynamically setting the interruptible policy until https://gitlab.com/gitlab-org/gitlab/-/issues/194023 is implemented

qualification/genbundle.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,9 +342,7 @@ def current_gitbranch_at(dirname):
342342
sphinx_target_for = {"html": "html", "pdf": "latexpdf"}
343343

344344
# The master GIT repo where our source artifacts reside
345-
GIT_MASTER = (
346-
"git@ssh.gitlab.adacore-it.com:eng/das/cov/gnatcoverage-qualification.git"
347-
)
345+
GIT_MASTER = os.environ.get("GIT_MASTER")
348346

349347
# The name of the subdir in the working directory where we'll fetch TOR
350348
# artifacts from. This would be an image of a "gnatcoverage" repository, from
@@ -482,6 +480,11 @@ def git_update(self):
482480
os.chdir(self.workdir)
483481

484482
gitref = self.o.gitsource if self.o.gitsource else GIT_MASTER
483+
exit_if(
484+
not gitref,
485+
"set the repository source either through the --git-source option"
486+
" or through the GIT_MASTER environment variable",
487+
)
485488

486489
announce("cloning git repository from %s" % gitref)
487490

testsuite/tests/U204-026-arch-mix/update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ cd $cwd
1919
cp -rf /tmp/U204-026-arch-mix/* .
2020

2121
# Then update the windows artifacts
22-
[ ! -d '/tmp/iod-dev' ] && git clone git@ssh.gitlab.adacore-it.com:eng/shared/iod-dev /tmp/iod-dev
22+
[ ! -d '/tmp/iod-dev' ] && git clone git-adacore:eng/shared/iod-dev /tmp/iod-dev
2323
/tmp/iod-dev/create-base.py --base-image x86_64-windows-2019
2424
git_branch=$(git rev-parse --abbrev-ref HEAD)
2525
sshpass ssh iod 'bash -s' < update_arch_mix_windows.sh $git_branch

testsuite/tests/U204-026-arch-mix/update_arch_mix_windows.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fi
99

1010
# Create a sandbox
1111
cd /Users/itmgr
12-
git clone git@ssh.gitlab.adacore-it.com:eng/cov/gnatcoverage
12+
git clone git-adacore:eng/cov/gnatcoverage
1313
anod init wave
1414

1515
# Checkout the right gnatcov branch

0 commit comments

Comments
 (0)