Skip to content

Commit

Permalink
jenkins: Remove mentions of LXD
Browse files Browse the repository at this point in the history
Signed-off-by: Stéphane Graber <[email protected]>
  • Loading branch information
stgraber committed Oct 26, 2023
1 parent 8a415cd commit b5102b4
Show file tree
Hide file tree
Showing 26 changed files with 74 additions and 74 deletions.
6 changes: 3 additions & 3 deletions jenkins/jobs/image-almalinux.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- job:
name: "image-almalinux"
concurrent: false
description: AlmaLinux OS images for LXC and LXD.
description: AlmaLinux OS images for LXC and Incus.
node: master
project-type: matrix

Expand Down Expand Up @@ -30,7 +30,7 @@
builders:
- shell: |-
cd /lxc-ci
LXD_ARCHITECTURE="${architecture}"
INCUS_ARCHITECTURE="${architecture}"
ARCH=${architecture}
[ "${ARCH}" = "amd64" ] && ARCH="x86_64"
Expand All @@ -44,7 +44,7 @@
fi
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/almalinux.yaml \
${LXD_ARCHITECTURE} ${TYPE} 7200 ${WORKSPACE} \
${INCUS_ARCHITECTURE} ${TYPE} 7200 ${WORKSPACE} \
-o image.architecture=${ARCH} -o image.release=${release} \
-o image.variant=${variant} ${EXTRA_ARGS}
Expand Down
6 changes: 3 additions & 3 deletions jenkins/jobs/image-alpine.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- job:
name: "image-alpine"
concurrent: false
description: Alpine images for LXC and LXD.
description: Alpine images for LXC and Incus.
node: master
project-type: matrix

Expand Down Expand Up @@ -33,7 +33,7 @@
builders:
- shell: |-
cd /lxc-ci
LXD_ARCHITECTURE="${architecture}"
INCUS_ARCHITECTURE="${architecture}"
ARCH=${architecture}
[ "${ARCH}" = "amd64" ] && ARCH="x86_64"
Expand All @@ -50,7 +50,7 @@
fi
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/alpine.yaml \
${LXD_ARCHITECTURE} ${TYPE} 600 ${WORKSPACE} \
${INCUS_ARCHITECTURE} ${TYPE} 600 ${WORKSPACE} \
-o image.architecture=${ARCH} -o image.release=${release} \
-o image.variant=${variant} ${EXTRA_ARGS}
Expand Down
6 changes: 3 additions & 3 deletions jenkins/jobs/image-alt.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- job:
name: "image-alt"
concurrent: false
description: ALT Linux images for LXC and LXD.
description: ALT Linux images for LXC and Incus.
node: master
project-type: matrix

Expand Down Expand Up @@ -31,12 +31,12 @@
builders:
- shell: |-
cd /lxc-ci
LXD_ARCHITECTURE="${architecture}"
INCUS_ARCHITECTURE="${architecture}"
ARCH=${architecture}
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/alt.yaml \
${LXD_ARCHITECTURE} container 3600 ${WORKSPACE} \
${INCUS_ARCHITECTURE} container 3600 ${WORKSPACE} \
-o image.variant=${variant} \
-o image.release=${release} -o image.architecture=${ARCH}
Expand Down
6 changes: 3 additions & 3 deletions jenkins/jobs/image-amazonlinux.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- job:
name: "image-amazonlinux"
concurrent: false
description: Amazon Linux images for LXC and LXD.
description: Amazon Linux images for LXC and Incus.
node: master
project-type: matrix

Expand All @@ -28,7 +28,7 @@
builders:
- shell: |-
cd /lxc-ci
LXD_ARCHITECTURE="${architecture}"
INCUS_ARCHITECTURE="${architecture}"
ARCH=${architecture}
[ "${ARCH}" = "amd64" ] && ARCH="x86_64"
Expand All @@ -39,7 +39,7 @@
TYPE="container"
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/amazonlinux.yaml \
${LXD_ARCHITECTURE} ${TYPE} 1800 ${WORKSPACE} \
${INCUS_ARCHITECTURE} ${TYPE} 1800 ${WORKSPACE} \
-o image.architecture=${ARCH} -o image.release=${REL} \
-o image.variant=${variant}
Expand Down
8 changes: 4 additions & 4 deletions jenkins/jobs/image-archlinux.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- job:
name: "image-archlinux"
concurrent: false
description: ArchLinux images for LXC and LXD.
description: ArchLinux images for LXC and Incus.
node: master
project-type: matrix

Expand Down Expand Up @@ -30,7 +30,7 @@
builders:
- shell: |-
cd /lxc-ci
LXD_ARCHITECTURE="${architecture}"
INCUS_ARCHITECTURE="${architecture}"
ARCH=${architecture}
[ "${ARCH}" = "amd64" ] && ARCH="x86_64"
Expand All @@ -47,12 +47,12 @@
if [ "${architecture}" = "amd64" ]; then
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/archlinux.yaml \
${LXD_ARCHITECTURE} ${TYPE} 1800 ${WORKSPACE} \
${INCUS_ARCHITECTURE} ${TYPE} 1800 ${WORKSPACE} \
-o image.architecture=${ARCH} -o image.variant=${variant}
fi
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/archlinux.yaml \
${LXD_ARCHITECTURE} ${TYPE} 1800 ${WORKSPACE} \
${INCUS_ARCHITECTURE} ${TYPE} 1800 ${WORKSPACE} \
-o image.architecture=${ARCH} \
-o source.url=http://os.archlinuxarm.org
Expand Down
6 changes: 3 additions & 3 deletions jenkins/jobs/image-busybox.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- job:
name: "image-busybox"
concurrent: false
description: Busybox images for LXC and LXD.
description: Busybox images for LXC and Incus.
node: master
project-type: matrix

Expand All @@ -28,12 +28,12 @@
builders:
- shell: |-
cd /lxc-ci
LXD_ARCHITECTURE="${architecture}"
INCUS_ARCHITECTURE="${architecture}"
ARCH=${architecture}
TYPE=container
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/busybox.yaml \
${LXD_ARCHITECTURE} ${TYPE} 1200 ${WORKSPACE} \
${INCUS_ARCHITECTURE} ${TYPE} 1200 ${WORKSPACE} \
-o image.architecture=${ARCH} -o image.release=${release}
properties:
Expand Down
6 changes: 3 additions & 3 deletions jenkins/jobs/image-centos.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- job:
name: "image-centos"
concurrent: false
description: CentOS images for LXC and LXD.
description: CentOS images for LXC and Incus.
node: master
project-type: matrix

Expand Down Expand Up @@ -31,7 +31,7 @@
builders:
- shell: |-
cd /lxc-ci
LXD_ARCHITECTURE="${architecture}"
INCUS_ARCHITECTURE="${architecture}"
ARCH=${architecture}
[ "${ARCH}" = "amd64" ] && ARCH="x86_64"
Expand Down Expand Up @@ -60,7 +60,7 @@
fi
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/centos.yaml \
${LXD_ARCHITECTURE} ${TYPE} 7200 ${WORKSPACE} \
${INCUS_ARCHITECTURE} ${TYPE} 7200 ${WORKSPACE} \
-o image.architecture=${ARCH} -o image.release=${release} \
-o image.variant=${variant} ${EXTRA_ARGS}
Expand Down
6 changes: 3 additions & 3 deletions jenkins/jobs/image-debian.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- job:
name: "image-debian"
concurrent: false
description: Debian images for LXC and LXD.
description: Debian images for LXC and Incus.
node: master
project-type: matrix

Expand Down Expand Up @@ -32,15 +32,15 @@
builders:
- shell: |-
cd /lxc-ci
LXD_ARCHITECTURE="${architecture}"
INCUS_ARCHITECTURE="${architecture}"
TYPE="container"
if [ "${architecture}" = "amd64" ] || [ "${architecture}" = "arm64" ]; then
TYPE="container,vm"
fi
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/debian.yaml \
${LXD_ARCHITECTURE} ${TYPE} 1800 ${WORKSPACE} \
${INCUS_ARCHITECTURE} ${TYPE} 1800 ${WORKSPACE} \
-o image.architecture=${architecture} \
-o image.release=${release} -o image.variant=${variant} \
-o source.url="http://ftp.us.debian.org/debian"
Expand Down
6 changes: 3 additions & 3 deletions jenkins/jobs/image-devuan.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- job:
name: "image-devuan"
concurrent: false
description: Devuan images for LXC and LXD.
description: Devuan images for LXC and Incus.
node: master
project-type: matrix

Expand Down Expand Up @@ -31,10 +31,10 @@
builders:
- shell: |-
cd /lxc-ci
LXD_ARCHITECTURE="${architecture}"
INCUS_ARCHITECTURE="${architecture}"
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/devuan.yaml \
${LXD_ARCHITECTURE} container 1800 ${WORKSPACE} \
${INCUS_ARCHITECTURE} container 1800 ${WORKSPACE} \
-o image.architecture=${architecture} \
-o image.release=${release} -o image.variant=${variant}
Expand Down
6 changes: 3 additions & 3 deletions jenkins/jobs/image-fedora.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- job:
name: "image-fedora"
concurrent: false
description: Fedora images for LXC and LXD.
description: Fedora images for LXC and Incus.
node: master
project-type: matrix

Expand Down Expand Up @@ -30,7 +30,7 @@
builders:
- shell: |-
cd /lxc-ci
LXD_ARCHITECTURE="${architecture}"
INCUS_ARCHITECTURE="${architecture}"
ARCH=${architecture}
[ "${ARCH}" = "amd64" ] && ARCH="x86_64"
Expand All @@ -42,7 +42,7 @@
fi
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/fedora.yaml \
${LXD_ARCHITECTURE} ${TYPE} 1800 ${WORKSPACE} \
${INCUS_ARCHITECTURE} ${TYPE} 1800 ${WORKSPACE} \
-o image.architecture=${ARCH} -o image.release=${release} \
-o image.variant=${variant}
Expand Down
6 changes: 3 additions & 3 deletions jenkins/jobs/image-funtoo.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- job:
name: "image-funtoo"
concurrent: false
description: Funtoo images for LXC and LXD.
description: Funtoo images for LXC and Incus.
node: master
project-type: matrix

Expand Down Expand Up @@ -29,14 +29,14 @@
builders:
- shell: |-
cd /lxc-ci
LXD_ARCHITECTURE="${architecture}"
INCUS_ARCHITECTURE="${architecture}"
ARCH=${architecture}
[ "${ARCH}" = "aarch64" ] && ARCH="arm64_generic"
[ "${ARCH}" = "amd64" ] && ARCH="generic_64"
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/funtoo.yaml \
${LXD_ARCHITECTURE} container 7200 ${WORKSPACE} \
${INCUS_ARCHITECTURE} container 7200 ${WORKSPACE} \
-o image.release=${release} -o image.architecture=${ARCH}
properties:
Expand Down
6 changes: 3 additions & 3 deletions jenkins/jobs/image-gentoo.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- job:
name: "image-gentoo"
concurrent: false
description: Gentoo images for LXC and LXD.
description: Gentoo images for LXC and Incus.
node: master
project-type: matrix

Expand Down Expand Up @@ -29,7 +29,7 @@
builders:
- shell: |-
cd /lxc-ci
LXD_ARCHITECTURE="${architecture}"
INCUS_ARCHITECTURE="${architecture}"
ARCH=${architecture}
Expand All @@ -46,7 +46,7 @@
fi
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/gentoo.yaml \
${LXD_ARCHITECTURE} ${TYPE} 14400 ${WORKSPACE} \
${INCUS_ARCHITECTURE} ${TYPE} 14400 ${WORKSPACE} \
-o image.architecture=${ARCH} -o image.variant=${variant} ${EXTRA_ARGS}
properties:
Expand Down
6 changes: 3 additions & 3 deletions jenkins/jobs/image-kali.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- job:
name: "image-kali"
concurrent: false
description: Kali images for LXC and LXD.
description: Kali images for LXC and Incus.
node: master
project-type: matrix

Expand Down Expand Up @@ -29,10 +29,10 @@
builders:
- shell: |-
cd /lxc-ci
LXD_ARCHITECTURE="${architecture}"
INCUS_ARCHITECTURE="${architecture}"
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/kali.yaml \
${LXD_ARCHITECTURE} container 1800 ${WORKSPACE} \
${INCUS_ARCHITECTURE} container 1800 ${WORKSPACE} \
-o image.architecture=${architecture} \
-o image.release=kali-rolling -o image.variant=${variant}
Expand Down
2 changes: 1 addition & 1 deletion jenkins/jobs/image-mint.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- job:
name: "image-mint"
concurrent: false
description: Linux Mint images for LXC and LXD.
description: Linux Mint images for LXC and Incus.
node: master
project-type: matrix

Expand Down
6 changes: 3 additions & 3 deletions jenkins/jobs/image-nixos.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- job:
name: "image-nixos"
concurrent: false
description: NixOS images for LXD.
description: NixOS images for Incus.
node: master
project-type: matrix

Expand All @@ -28,14 +28,14 @@
builders:
- shell: |-
cd /lxc-ci
LXD_ARCHITECTURE="${architecture}"
INCUS_ARCHITECTURE="${architecture}"
ARCH=${architecture}
[ "${ARCH}" = "amd64" ] && ARCH="x86_64"
[ "${ARCH}" = "arm64" ] && ARCH="aarch64"
exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/nixos.yaml \
${LXD_ARCHITECTURE} container 14400 ${WORKSPACE} \
${INCUS_ARCHITECTURE} container 14400 ${WORKSPACE} \
-o image.architecture=${ARCH}
properties:
Expand Down
Loading

0 comments on commit b5102b4

Please sign in to comment.