Code Review
/
infra
/
cicd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
engine: Adjust build-timeout and switch to wget for OpenStack release job
[infra/cicd.git]
/
jjb
/
nolabs
/
booking-job-macros.yaml
diff --git
a/jjb/nolabs/booking-job-macros.yaml
b/jjb/nolabs/booking-job-macros.yaml
index 4fc20d345af6f4f399f6e2287730210eb444846c..a633c6ffcf6807475490f4f364db235942de58aa 100644
(file)
--- a/
jjb/nolabs/booking-job-macros.yaml
+++ b/
jjb/nolabs/booking-job-macros.yaml
@@
-22,10
+22,11
@@
name: 'handlebooking-macro'
builders:
- shell:
name: 'handlebooking-macro'
builders:
- shell:
- !include-raw: ../cloud-infra/wait-for-pkg-manager.sh
+ !include-raw: ../cloud-infra/
scripts/
wait-for-pkg-manager.sh
- shell: |
#!/bin/bash
- shell: |
#!/bin/bash
- cp $OPENRC_FILE /tmp/openrc
+ /bin/rm -f /tmp/openrc
+ /bin/cp -f $OPENRC_FILE /tmp/openrc
- shell:
!include-raw: ./handle-booking.sh
- shell:
!include-raw: ./handle-booking.sh
@@
-33,9
+34,10
@@
name: 'deletebooking-macro'
builders:
- shell:
name: 'deletebooking-macro'
builders:
- shell:
- !include-raw: ../cloud-infra/wait-for-pkg-manager.sh
+ !include-raw: ../cloud-infra/
scripts/
wait-for-pkg-manager.sh
- shell: |
#!/bin/bash
- shell: |
#!/bin/bash
- cp $OPENRC_FILE /tmp/openrc
+ /bin/rm -f /tmp/openrc
+ /bin/cp -f $OPENRC_FILE /tmp/openrc
- shell:
!include-raw: ./delete-booking.sh
- shell:
!include-raw: ./delete-booking.sh