Skip to content

Commit 7e676d5

Browse files
committed
Fix CI
1 parent 44b448f commit 7e676d5

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

.azure-devops/azure-pipelines.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,18 @@ jobs:
203203
env:
204204
IMAGE_TAG: $(IMAGE_TAG)
205205
206-
- script: skopeo --version
207-
displayName: Skopeo version
206+
# This can be omitted once runner images have a version of Skopeo > 1.4.1
207+
- script: |
208+
sudo apt purge buildah golang-github-containers-common podman skopeo
209+
sudo apt autoremove --purge
210+
REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable"
211+
source /etc/os-release
212+
sudo sh -c "echo 'deb ${REPO_URL}/x${NAME}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list"
213+
sudo wget -qnv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${NAME}_${VERSION_ID}/Release.key -O Release.key
214+
sudo apt-key add Release.key
215+
sudo apt-get update
216+
sudo apt-get install skopeo
217+
displayName: Update skopeo
208218
209219
210220
- script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Additionally, it is desirable to add new tests to cover any new functionality.
3030

3131
When a PR is created, some tests will be automatically triggered against the PR. The full suite of tests requires secrets and needs to be triggered by a maintainer.
3232

33-
Testing and publishing the AzDO task requires the `AZDO_TOKEN` GitHub secret to be an AzDO PAT for monacotools with Build Read & Execute, Marketplace Publish and Packing Read & Write permissions.
33+
Testing and publishing the AzDO task requires the `AZDO_TOKEN` GitHub secret to be an AzDO PAT for monacotools with Build Read & Execute, Marketplace Acquire & Manage, Extensions Read & Manage and Packing Read & Write permissions.
3434

3535
## Miscellaneous
3636

scripts/test-azdo.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ echo "Using VSIX_FILE=$vsix_file"
1616
echo "Publishing private extension version..."
1717
tfx extension publish --token "$AZDO_TOKEN" --vsix "$vsix_file" --override "{\"public\": false, \"publisher\": \"devcontainers-dev\"}" --share-with monacotools
1818

19+
echo "Uninstalling private extension"
20+
tfx extension uninstall --token "$AZDO_TOKEN" --service-url "$AZDO_ORG" --extension-id "ci" --publisher "devcontainers-dev" || true
21+
1922
echo "Installing private extension"
20-
tfx extension install --token "$AZDO_TOKEN" --vsix "$vsix_file" --service-url "$AZDO_ORG"
23+
tfx extension install --token "$AZDO_TOKEN" --vsix "$vsix_file" --service-url "$AZDO_ORG"
2124

2225
sleep 30s # hacky workaround for AzDO picking up stale extension version
2326

0 commit comments

Comments
 (0)