Jonathan Cave has proposed merging ~jocave/hwcert-jenkins-jobs:extra-trello-script-to-snap into hwcert-jenkins-jobs:master.
Requested reviews: hwcert-jenkins (hwcert-jenkins) For more details, see: https://code.launchpad.net/~jocave/hwcert-jenkins-jobs/+git/hwcert-jenkins-jobs/+merge/428304 Found a missed script to snap conversion. Also added back lock files to some lines. Not sure if it was intentional to remove those. -- Your team hwcert-jenkins is requested to review the proposed merge of ~jocave/hwcert-jenkins-jobs:extra-trello-script-to-snap into hwcert-jenkins-jobs:master.
diff --git a/jobs/snap-testing/run-cdts-list-bootstrapped.sh b/jobs/snap-testing/run-cdts-list-bootstrapped.sh index 2320853..c510868 100644 --- a/jobs/snap-testing/run-cdts-list-bootstrapped.sh +++ b/jobs/snap-testing/run-cdts-list-bootstrapped.sh @@ -183,7 +183,7 @@ git -C hwcert-jenkins-tools pull -q || (rm -rf hwcert-jenkins-tools && git clone git -C hwcert-data pull -q || git clone -q git+ssh://[email protected]/~canonical-hw-cert/hwcert-jenkins-jobs/+git/hwcert-data -flock certification-dashboard-manager.snap-board-updater --config hwcert-data/snaps.yaml -a {arch} -b {store} -n {name} -s {snap} -v ${{VERSION}} -r ${{REV}} -t __track__{track} -c {channel} --cardonly /dev/null +flock /tmp/TRELLO-UPDATE.LOCK certification-dashboard-manager.snap-board-updater --config hwcert-data/snaps.yaml -a {arch} -b {store} -n {name} -s {snap} -v ${{VERSION}} -r ${{REV}} -t __track__{track} -c {channel} --cardonly /dev/null JOB_ID=$(testflinger submit -q job.yaml) echo "JOB_ID: ${{JOB_ID}}" @@ -220,7 +220,7 @@ cat artifacts/snaplist.txt >> artifacts/summary hwcert-jenkins-tools/mailtool -t {email} -s "[TESTFLINGER] {name} {snap} (${{REV}}) {track}/{channel}" artifacts/summary -flock certification-dashboard-manager.snap-board-updater --config hwcert-data/snaps.yaml -a {arch} -b {store} -n {name} -s {snap} -v ${{VERSION}} -r ${{REV}} -t __track__{track} -c {channel} artifacts/raw_summary +flock /tmp/TRELLO-UPDATE.LOCK certification-dashboard-manager.snap-board-updater --config hwcert-data/snaps.yaml -a {arch} -b {store} -n {name} -s {snap} -v ${{VERSION}} -r ${{REV}} -t __track__{track} -c {channel} artifacts/raw_summary echo "Test exit status: ${{TEST_STATUS}}" exit $TEST_STATUS diff --git a/jobs/sru/run-sru.sh b/jobs/sru/run-sru.sh index e6c8a22..12bcd4b 100644 --- a/jobs/sru/run-sru.sh +++ b/jobs/sru/run-sru.sh @@ -257,9 +257,9 @@ git -C hwcert-data pull -q || git clone -q git+ssh://[email protected] # Create a card if this is a proper SRU run if [ "{trello_reporting}" == "True" ]; then if [[ "{srutype}" =~ "raspi" ]] || [[ "{series}" == "impish" ]] || [[ "{series}" == "jammy" ]]; then - flock /tmp/TRELLO-UPDATE.LOCK hwcert-jenkins-tools/trello-board-updater-desktop.py --config hwcert-data/debs.yaml -a {arch} -n {system-id} -k {kernel-to-check} -s {series} -t {srutype} --cardonly /dev/null + flock /tmp/TRELLO-UPDATE.LOCK certification-dashboard-manager.deb-board-updater --config hwcert-data/debs.yaml -a {arch} -n {system-id} -k {kernel-to-check} -s {series} -t {srutype} --cardonly /dev/null else - flock /tmp/TRELLO-UPDATE.LOCK hwcert-jenkins-tools/trello-board-updater-desktop.py --config hwcert-data/debs.yaml -a {arch} -n {name} -k {kernel-to-check} -s {series} -t {srutype} --cardonly /dev/null + flock /tmp/TRELLO-UPDATE.LOCK certification-dashboard-manager.deb-board-updater --config hwcert-data/debs.yaml -a {arch} -n {name} -k {kernel-to-check} -s {series} -t {srutype} --cardonly /dev/null fi fi @@ -308,9 +308,9 @@ fi # Add a result to the card if this is proper sru run if [ "{trello_reporting}" == "True" ]; then if [[ "{srutype}" =~ "raspi" ]] || [[ "{series}" == "impish" ]] || [[ "{series}" == "jammy" ]]; then - flock certification-dashboard-manager.deb-board-updater --config hwcert-data/debs.yaml -a {arch} -n {system-id} -k {kernel-to-check} -s {series} -t {srutype} artifacts/raw_summary + flock /tmp/TRELLO-UPDATE.LOCK certification-dashboard-manager.deb-board-updater --config hwcert-data/debs.yaml -a {arch} -n {system-id} -k {kernel-to-check} -s {series} -t {srutype} artifacts/raw_summary else - flock certification-dashboard-manager.deb-board-updater --config hwcert-data/debs.yaml -a {arch} -n {name} -k {kernel-to-check} -s {series} -t {srutype} artifacts/raw_summary + flock /tmp/TRELLO-UPDATE.LOCK certification-dashboard-manager.deb-board-updater --config hwcert-data/debs.yaml -a {arch} -n {name} -k {kernel-to-check} -s {series} -t {srutype} artifacts/raw_summary fi fi
-- Mailing list: https://launchpad.net/~canonical-hw-cert Post to : [email protected] Unsubscribe : https://launchpad.net/~canonical-hw-cert More help : https://help.launchpad.net/ListHelp
