Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Image CI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
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
linuxsupport
Testing
Image CI
Commits
93d3b348
Verified
Commit
93d3b348
authored
4 years ago
by
Alex Iribarren
Browse files
Options
Downloads
Patches
Plain Diff
Deal correctly with multiple arches
parent
01454951
No related branches found
No related tags found
No related merge requests found
Pipeline
#2644684
passed
4 years ago
Stage: test
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
ci/c8.yml
+4
-0
4 additions, 0 deletions
ci/c8.yml
ci/c8s.yml
+4
-0
4 additions, 0 deletions
ci/c8s.yml
ci/cc7.yml
+4
-0
4 additions, 0 deletions
ci/cc7.yml
ci/common.yml
+2
-2
2 additions, 2 deletions
ci/common.yml
with
14 additions
and
2 deletions
ci/c8.yml
+
4
−
0
View file @
93d3b348
...
...
@@ -2,6 +2,7 @@ c8_unman_physical:
extends
:
.test_unmanaged_physical
variables
:
OS
:
8
ARCH
:
x86_64
only
:
variables
:
-
$TEST_OS8 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_UNMANAGED == 'True'
...
...
@@ -10,6 +11,7 @@ c8_unman_virtual:
extends
:
.test_unmanaged_virtual
variables
:
OS
:
8
ARCH
:
x86_64
DELETE_FAILURES
:
"
False"
only
:
variables
:
...
...
@@ -19,6 +21,7 @@ c8_puppet_physical:
extends
:
.test_puppet_physical
variables
:
OS
:
8
ARCH
:
x86_64
only
:
variables
:
-
$TEST_OS8 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_PUPPET == 'True'
...
...
@@ -27,6 +30,7 @@ c8_puppet_virtual:
extends
:
.test_puppet_virtual
variables
:
OS
:
8
ARCH
:
x86_64
only
:
variables
:
-
$TEST_OS8 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_PUPPET == 'True'
This diff is collapsed.
Click to expand it.
ci/c8s.yml
+
4
−
0
View file @
93d3b348
...
...
@@ -2,6 +2,7 @@ cs8_unman_physical:
extends
:
.test_unmanaged_physical
variables
:
OS
:
8s
ARCH
:
x86_64
only
:
variables
:
-
$TEST_OS8s == 'True' && $TEST_PHYSICAL == 'True' && $TEST_UNMANAGED == 'True'
...
...
@@ -10,6 +11,7 @@ cs8_unman_virtual:
extends
:
.test_unmanaged_virtual
variables
:
OS
:
8s
ARCH
:
x86_64
DELETE_FAILURES
:
"
False"
only
:
variables
:
...
...
@@ -19,6 +21,7 @@ cs8_puppet_physical:
extends
:
.test_puppet_physical
variables
:
OS
:
8s
ARCH
:
x86_64
only
:
variables
:
-
$TEST_OS8s == 'True' && $TEST_PHYSICAL == 'True' && $TEST_PUPPET == 'True'
...
...
@@ -27,6 +30,7 @@ cs8_puppet_virtual:
extends
:
.test_puppet_virtual
variables
:
OS
:
8s
ARCH
:
x86_64
only
:
variables
:
-
$TEST_OS8s == 'True' && $TEST_VIRTUAL == 'True' && $TEST_PUPPET == 'True'
This diff is collapsed.
Click to expand it.
ci/cc7.yml
+
4
−
0
View file @
93d3b348
...
...
@@ -2,6 +2,7 @@ cc7_unman_physical:
extends
:
.test_unmanaged_physical
variables
:
OS
:
7
ARCH
:
x86_64
only
:
variables
:
-
$TEST_OS7 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_UNMANAGED == 'True'
...
...
@@ -10,6 +11,7 @@ cc7_unman_virtual:
extends
:
.test_unmanaged_virtual
variables
:
OS
:
7
ARCH
:
x86_64
DELETE_FAILURES
:
"
False"
only
:
variables
:
...
...
@@ -19,6 +21,7 @@ cc7_puppet_physical:
extends
:
.test_puppet_physical
variables
:
OS
:
7
ARCH
:
x86_64
only
:
variables
:
-
$TEST_OS7 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_PUPPET == 'True'
...
...
@@ -27,6 +30,7 @@ cc7_puppet_virtual:
extends
:
.test_puppet_virtual
variables
:
OS
:
7
ARCH
:
x86_64
only
:
variables
:
-
$TEST_OS7 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_PUPPET == 'True'
This diff is collapsed.
Click to expand it.
ci/common.yml
+
2
−
2
View file @
93d3b348
...
...
@@ -29,10 +29,10 @@
OS_DISTRO="C"
fi
fi
IMAGE=$(openstack image list --property os_distro="${OS_DISTRO}" --property os_distro_major="${OS_MAJOR}" --property os_edition="Base" --public --sort created_at -c ID -f value | tail -n1)
IMAGE=$(openstack image list --property os_distro="${OS_DISTRO}" --property os_distro_major="${OS_MAJOR}" --property
architecture="${ARCH}" --property
os_edition="Base" --public --sort created_at -c ID -f value | tail -n1)
if [[ -z "${IMAGE}" ]]; then
echo "No image found matching:"
echo openstack image list --property os_distro="${OS_DISTRO}" --property os_distro_major="${OS_MAJOR}" --property os_edition="Base" --public --sort created_at
echo openstack image list --property os_distro="${OS_DISTRO}" --property os_distro_major="${OS_MAJOR}" --property
architecture="${ARCH}" --property
os_edition="Base" --public --sort created_at
exit 1
fi
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment