mirror of
https://github.com/kasmtech/workspaces-core-images.git
synced 2024-11-24 16:33:19 +01:00
Merge branch 'feature/KASM-5423-named-schedules' into 'develop'
Resolve KASM-5423 "Feature/ named schedules" Closes KASM-5423 See merge request kasm-technologies/internal/workspaces-core-images!178
This commit is contained in:
commit
d38104e657
@ -189,7 +189,7 @@ manifest_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
|
||||
when: always
|
||||
variables:
|
||||
SCHEDULED: "{{ SCHEDULED }}"
|
||||
SCHEDULE_NAME: "{{ SCHEDULED_NAME }}"
|
||||
SCHEDULE_NAME: "{{ SCHEDULE_NAME }}"
|
||||
script:
|
||||
- apk add bash
|
||||
- bash ci-scripts/manifest.sh "{{ IMAGE.name1 }}" "{{ IMAGE.name2 }}" "multi"
|
||||
@ -217,7 +217,7 @@ manifest_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
|
||||
when: always
|
||||
variables:
|
||||
SCHEDULED: "{{ SCHEDULED }}"
|
||||
SCHEDULE_NAME: "{{ SCHEDULED_NAME }}"
|
||||
SCHEDULE_NAME: "{{ SCHEDULE_NAME }}"
|
||||
script:
|
||||
- apk add bash
|
||||
- bash ci-scripts/manifest.sh "{{ IMAGE.name1 }}" "{{ IMAGE.name2 }}" "single"
|
||||
|
@ -21,7 +21,7 @@ fi
|
||||
|
||||
# Determine if this is a rolling build
|
||||
if [[ "${SCHEDULED}" != "NO" ]]; then
|
||||
if [[ "${SCHEDULE_NAME}" == "NO" ]]; then
|
||||
if [[ "${SCHEDULE_NAME}" == "NO" ]]; then
|
||||
SANITIZED_BRANCH=${SANITIZED_BRANCH}-rolling
|
||||
else
|
||||
SANITIZED_BRANCH=${SANITIZED_BRANCH}-rolling-${SCHEDULE_NAME}
|
||||
|
@ -3,9 +3,9 @@ set -ex
|
||||
|
||||
ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
|
||||
if [[ "${ARCH}" == "arm64" ]]; then
|
||||
LIBSSLURL="http://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.20_arm64.deb"
|
||||
LIBSSLURL="http://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.21_arm64.deb"
|
||||
else
|
||||
LIBSSLURL="http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb"
|
||||
LIBSSLURL="http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.21_amd64.deb"
|
||||
fi
|
||||
|
||||
# intall squid
|
||||
|
@ -153,6 +153,8 @@ elif [ "$DISTRO" = "opensuse" ]; then
|
||||
xfce4-notifyd \
|
||||
xfce4-terminal \
|
||||
xset
|
||||
# Pidof is no longer shipped in OpenSuse
|
||||
ln -s /usr/bin/pgrep /usr/bin/pidof
|
||||
elif [[ "$DISTRO" = @(fedora37|fedora38|fedora39) ]]; then
|
||||
dnf group install xfce -y
|
||||
dnf install -y \
|
||||
|
Loading…
Reference in New Issue
Block a user