Compare commits
2 Commits
Author | SHA1 | Date |
---|---|---|
|
2325da85fd | |
|
d278eedcbd |
|
@ -63,7 +63,12 @@ pipeline {
|
|||
stage('Publish Container') {
|
||||
steps {
|
||||
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() {
|
||||
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}
|
||||
|
|
|
@ -91,7 +91,7 @@ class HUDService:
|
|||
try:
|
||||
url = self.urls[monitor.name]
|
||||
except KeyError:
|
||||
continue
|
||||
url = None
|
||||
if window is None:
|
||||
window = await self.marionette.new_window('window')
|
||||
self.windows[monitor.name] = window
|
||||
|
@ -101,10 +101,11 @@ class HUDService:
|
|||
y=1,
|
||||
)
|
||||
await self.marionette.fullscreen()
|
||||
log.info('Screen %s: Opening URL %s', monitor.name, url)
|
||||
tasks.append(
|
||||
asyncio.create_task(self.marionette.navigate(url))
|
||||
)
|
||||
if url is not None:
|
||||
log.info('Screen %s: Opening URL %s', monitor.name, url)
|
||||
tasks.append(
|
||||
asyncio.create_task(self.marionette.navigate(url))
|
||||
)
|
||||
window = None
|
||||
if tasks:
|
||||
await asyncio.wait(tasks)
|
||||
|
|
Loading…
Reference in New Issue