The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc-ci/pull/146
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) ===
From a7e600f403b3d6edfd614aaa120e1d94bc9b235b Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Mon, 20 Apr 2020 15:09:56 +0200
Subject: [PATCH 1/3] images/apertis: Use systemctl instead of custom symlinks
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
images/apertis.yaml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/images/apertis.yaml b/images/apertis.yaml
index 476decb..2e904b2 100644
--- a/images/apertis.yaml
+++ b/images/apertis.yaml
@@ -78,9 +78,8 @@ actions:
rm /etc/resolv.conf
ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
- ln -s /lib/systemd/system/systemd-networkd.service
/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
- ln -s /lib/systemd/system/systemd-networkd.socket
/etc/systemd/system/multi-user.target.wants/systemd-networkd.socket
- ln -s /lib/systemd/system/systemd-resolved.service
/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
+ systemctl enable systemd-networkd.service
+ systemctl enable systemd-resolved.service
environment:
variables:
From 8648b6374b88d2af04dd711949ec6dbb6f8d5f17 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Mon, 20 Apr 2020 15:10:18 +0200
Subject: [PATCH 2/3] jenkins/jobs/apertis: Add new releases
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
jenkins/jobs/image-apertis.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/jenkins/jobs/image-apertis.yaml b/jenkins/jobs/image-apertis.yaml
index 98be99f..39a6d01 100644
--- a/jenkins/jobs/image-apertis.yaml
+++ b/jenkins/jobs/image-apertis.yaml
@@ -19,6 +19,8 @@
type: user-defined
values:
- '18.12'
+ - 'v2019.2'
+ - 'v2020.0'
- axis:
name: variant
From 28f04d96e99682b60f00711b6b7e1deae75c96b1 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Mon, 20 Apr 2020 15:36:47 +0200
Subject: [PATCH 3/3] images/pld: Clean up yaml file
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
images/pld.yaml | 138 +++++++++++++++++++++++++-----------------------
1 file changed, 73 insertions(+), 65 deletions(-)
diff --git a/images/pld.yaml b/images/pld.yaml
index f72966d..6b5dd33 100644
--- a/images/pld.yaml
+++ b/images/pld.yaml
@@ -4,23 +4,71 @@ image:
source:
downloader: docker-http
-# url: pldlinux/i686:latest
targets:
lxc:
create-message: |-
You just created a {{ image.description }} container.
+
config:
- type: all
content: |-
lxc.include = LXC_TEMPLATE_CONFIG/common.conf
+
- type: user
content: |-
lxc.include = LXC_TEMPLATE_CONFIG/userns.conf
+
- type: all
content: |-
lxc.arch = {{ image.architecture_personality }}
+
+files:
+- name: hostname
+ path: /etc/hostname
+ generator: hostname
+ when: create
+
+- path: /etc/machine-id
+ generator: dump
+ when: create
+
+- path: /var/lib/dbus/machine-id
+ generator: remove
+ when: create
+
+- name: network
+ path: /etc/sysconfig/network
+ generator: dump
+ templated: true
+ content: |-
+ NETWORKING=yes
+ IPV4_NETWORKING=yes
+ IPV6_NETWORKING=no
+ HOSTNAME=LXC_NAME
+
+- name: network.lxd
+ path: /etc/sysconfig/network
+ generator: template
+ content: |-
+ NETWORKING=yes
+ IPV4_NETWORKING=yes
+ IPV6_NETWORKING=no
+ HOSTNAME={{ container.name }}
+
+- name: ifcfg-eth0
+ path: /etc/sysconfig/interfaces/ifcfg-eth0
+ generator: dump
+ templated: true
+ content: |-
+ DEVICE=eth0
+ ONBOOT=yes
+ BOOTPROTO=dhcp
+ # static ip configuration
+ #BOOTPROTO=none
+ #IPADDR=10.1.1.10/24
+
packages:
custom-manager:
refresh:
@@ -38,20 +86,32 @@ packages:
clean:
cmd: poldek
flags: [ --clean ]
+ update: false
+ cleanup: true
+
+ sets:
+ - packages:
+ - dhcp-client
+ - localedb-src
+ - rc-scripts
+ - tzdata
+ - vim
+ action: install
actions:
- - trigger: post-unpack
- action: |-
- #!/bin/sh
- set -eux
- # re-enable network initialization disabled in docker image
- rm -f /var/lock/subsys/network
- # disable i18n installing
- sed -i '$ a%_install_langs C' /etc/rpm/macros
- # no systemd here
- sed -i '/^RPM_ENABLE_SYSTEMD_SERVICE=/ s/=yes/=no/' /etc/sysconfig/rpm
- - trigger: post-packages
- action: |-
+- trigger: post-unpack
+ action: |-
+ #!/bin/sh
+ set -eux
+ # re-enable network initialization disabled in docker image
+ rm -f /var/lock/subsys/network
+ # disable i18n installing
+ sed -i '$ a%_install_langs C' /etc/rpm/macros
+ # no systemd here
+ sed -i '/^RPM_ENABLE_SYSTEMD_SERVICE=/ s/=yes/=no/' /etc/sysconfig/rpm
+
+- trigger: post-packages
+ action: |-
#!/bin/sh
set -eux
@@ -96,55 +156,3 @@ actions:
rpm -e localedb-src
rm -f /var/cache/hrmib/*
rm -f /var/lib/rpm/__db.*
-
-packages:
- update: false
- cleanup: true
- sets:
- - packages:
- - dhcp-client
- - localedb-src
- - rc-scripts
- - tzdata
- - vim
- action: install
-
-files:
- - name: hostname
- path: /etc/hostname
- generator: hostname
- when: create
- - path: /etc/machine-id
- generator: dump
- when: create
- - path: /var/lib/dbus/machine-id
- generator: remove
- when: create
- - name: network
- path: /etc/sysconfig/network
- generator: dump
- templated: true
- content: |-
- NETWORKING=yes
- IPV4_NETWORKING=yes
- IPV6_NETWORKING=no
- HOSTNAME=LXC_NAME
- - name: network.lxd
- path: /etc/sysconfig/network
- generator: template
- content: |-
- NETWORKING=yes
- IPV4_NETWORKING=yes
- IPV6_NETWORKING=no
- HOSTNAME={{ container.name }}
- - name: ifcfg-eth0
- path: /etc/sysconfig/interfaces/ifcfg-eth0
- generator: dump
- templated: true
- content: |-
- DEVICE=eth0
- ONBOOT=yes
- BOOTPROTO=dhcp
- # static ip configuration
- #BOOTPROTO=none
- #IPADDR=10.1.1.10/24
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
