Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LHCbDIRAC
Manage
Activity
Members
Labels
Plan
Issues
16
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
11
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LHCb Dirac
LHCbDIRAC
Merge requests
!1547
test: upgrade docker version
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
test: upgrade docker version
fstagni/LHCbDIRAC:upgradeDocker
into
master
Overview
0
Commits
1
Pipelines
0
Changes
1
Merged
Federico Stagni
requested to merge
fstagni/LHCbDIRAC:upgradeDocker
into
master
9 months ago
Overview
0
Commits
1
Pipelines
0
Changes
1
Expand
Just set it equal to what is used in
devel
branch
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
37b024b4
1 commit,
9 months ago
1 file
+
6
−
5
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
.gitlab-ci.yml
+
6
−
5
Options
@@ -150,11 +150,11 @@ check_docs:
# Integration tests
integration_tests
:
stage
:
test
image
:
registry.cern.ch/docker.io/library/alpine:3.1
7
image
:
registry.cern.ch/docker.io/library/alpine:3.1
9.1
tags
:
-
docker-privileged-xl
services
:
-
docker:2
3
.0.1-dind
-
docker:2
5
.0.1-dind
variables
:
DOCKER_TLS_CERTDIR
:
"
"
DOCKER_HOST
:
tcp://docker:2375/
@@ -168,12 +168,13 @@ integration_tests:
parallel
:
matrix
:
-
TEST_COMMAND
:
-
python3 ./integration_tests.py create "LHCBDIRAC_RELEASE=$${lhcbdiracTag}" --extra-module LHCbDIRAC=../LHCbDIRAC
-
python3 ./integration_tests.py create "LHCBDIRAC_RELEASE=$${lhcbdiracTag}" TEST_HTTPS=Yes --extra-module LHCbDIRAC=../LHCbDIRAC
-
python3 ./integration_tests.py create "LHCBDIRAC_RELEASE=$${lhcbdiracTag}" TEST_HTTPS=No --extra-module LHCbDIRAC=../LHCbDIRAC
before_script
:
# Install dependencies
-
apk add docker py3-pip python3 bash git docker-compose jq curl
-
pip3 install typer pyyaml gitpython diraccfg
-
python3 -m venv .venv
-
source .venv/bin/activate
-
python3 -m pip install typer pyyaml gitpython diraccfg packaging
# Find the latest LHCbDIRAC release
-
git remote add upstream https://gitlab.cern.ch/lhcb-dirac/LHCbDIRAC.git && git fetch upstream
-
lhcbdiracTag=$(git describe --tags --match '*[0-9]*' --exclude 'v[0-9]r*' --exclude 'v[0-9][0-9]r*' --abbrev=0)
Loading