Compare commits
2 Commits
Author | SHA1 | Date |
---|---|---|
|
2325da85fd | |
|
d278eedcbd |
|
@ -63,7 +63,12 @@ pipeline {
|
||||||
stage('Publish Container') {
|
stage('Publish Container') {
|
||||||
steps {
|
steps {
|
||||||
container('podman') {
|
container('podman') {
|
||||||
sh '. ci/publish-container.sh'
|
withCredentials([usernameColonPassword(
|
||||||
|
credentialsId: 'jenkins-packages',
|
||||||
|
variable: 'PODMAN_AUTH',
|
||||||
|
)]) {
|
||||||
|
sh '. ci/publish-container.sh'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,10 @@
|
||||||
|
|
||||||
push() {
|
push() {
|
||||||
tag=$(tag_name "$1")
|
tag=$(tag_name "$1")
|
||||||
podman push hudctrl:$(tag_name ${BUILD_TAG}) registry.pyrocufflink.blue/hudctrl:${tag}
|
podman push \
|
||||||
|
--creds="${PODMAN_AUTH}" \
|
||||||
|
hudctrl:$(tag_name ${BUILD_TAG}) \
|
||||||
|
git.pyrocufflink.blue/containerimages/hudctrl:${tag}
|
||||||
}
|
}
|
||||||
|
|
||||||
push ${BUILD_TAG}
|
push ${BUILD_TAG}
|
||||||
|
|
|
@ -91,7 +91,7 @@ class HUDService:
|
||||||
try:
|
try:
|
||||||
url = self.urls[monitor.name]
|
url = self.urls[monitor.name]
|
||||||
except KeyError:
|
except KeyError:
|
||||||
continue
|
url = None
|
||||||
if window is None:
|
if window is None:
|
||||||
window = await self.marionette.new_window('window')
|
window = await self.marionette.new_window('window')
|
||||||
self.windows[monitor.name] = window
|
self.windows[monitor.name] = window
|
||||||
|
@ -101,10 +101,11 @@ class HUDService:
|
||||||
y=1,
|
y=1,
|
||||||
)
|
)
|
||||||
await self.marionette.fullscreen()
|
await self.marionette.fullscreen()
|
||||||
log.info('Screen %s: Opening URL %s', monitor.name, url)
|
if url is not None:
|
||||||
tasks.append(
|
log.info('Screen %s: Opening URL %s', monitor.name, url)
|
||||||
asyncio.create_task(self.marionette.navigate(url))
|
tasks.append(
|
||||||
)
|
asyncio.create_task(self.marionette.navigate(url))
|
||||||
|
)
|
||||||
window = None
|
window = None
|
||||||
if tasks:
|
if tasks:
|
||||||
await asyncio.wait(tasks)
|
await asyncio.wait(tasks)
|
||||||
|
|
Loading…
Reference in New Issue