The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc-ci/pull/63
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
From 9b37a35cb5f4486525deba604deec9df43b8d045 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Mon, 19 Aug 2019 18:29:40 +0200
Subject: [PATCH] jenkins/jobs: Add missing variant image option
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
jenkins/jobs/image-alpine.yaml | 3 ++-
jenkins/jobs/image-debian.yaml | 1 +
jenkins/jobs/image-devuan.yaml | 3 ++-
jenkins/jobs/image-opensuse.yaml | 3 ++-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/jenkins/jobs/image-alpine.yaml b/jenkins/jobs/image-alpine.yaml
index 6c5cf3a..69080c4 100644
--- a/jenkins/jobs/image-alpine.yaml
+++ b/jenkins/jobs/image-alpine.yaml
@@ -53,7 +53,8 @@
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/alpine.yaml \
${LXD_ARCHITECTURE} 600 ${WORKSPACE} \
-o image.architecture=${ARCH} \
- -o image.release=${release}
+ -o image.release=${release} \
+ -o image.variant=${variant}
execution-strategy:
combination-filter: '
diff --git a/jenkins/jobs/image-debian.yaml b/jenkins/jobs/image-debian.yaml
index b619925..152b73a 100644
--- a/jenkins/jobs/image-debian.yaml
+++ b/jenkins/jobs/image-debian.yaml
@@ -53,6 +53,7 @@
${LXD_ARCHITECTURE} 1800 ${WORKSPACE} \
-o image.architecture=${architecture} \
-o image.release=${release} \
+ -o image.variant=${variant} \
-o source.url="http://ftp.us.debian.org/debian";
execution-strategy:
diff --git a/jenkins/jobs/image-devuan.yaml b/jenkins/jobs/image-devuan.yaml
index 96af11d..648ac0e 100644
--- a/jenkins/jobs/image-devuan.yaml
+++ b/jenkins/jobs/image-devuan.yaml
@@ -46,7 +46,8 @@
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/devuan.yaml \
${LXD_ARCHITECTURE} 1800 ${WORKSPACE} \
-o image.architecture=${architecture} \
- -o image.release=${release}
+ -o image.release=${release} \
+ -o image.variant=${variant}
properties:
- build-discarder:
diff --git a/jenkins/jobs/image-opensuse.yaml b/jenkins/jobs/image-opensuse.yaml
index 71dbb2d..c16a2e8 100644
--- a/jenkins/jobs/image-opensuse.yaml
+++ b/jenkins/jobs/image-opensuse.yaml
@@ -51,7 +51,8 @@
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/opensuse.yaml \
${LXD_ARCHITECTURE} 1800 ${WORKSPACE} \
-o image.architecture=${ARCH} \
- -o image.release=${release}
+ -o image.release=${release} \
+ -o image.variant=${variant}
execution-strategy:
combination-filter: '
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
