Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DRAFT] [WIP] Try SNP CI on AL3.0 #6808

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .azure-pipelines-templates/deploy_aci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
env:
ACR_REGISTRY_RESOURCE_NAME: ccfmsrc
ACR_REGISTRY: ccfmsrc.azurecr.io
BASE_IMAGE: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
BASE_IMAGE: mcr.microsoft.com/azurelinux/base/core:3.0

- script: |
set -ex
Expand Down Expand Up @@ -156,11 +156,11 @@ jobs:
python3 -m venv ./scripts/azure_deployment/.env
source ./scripts/azure_deployment/.env/bin/activate
pip install -r ./scripts/azure_deployment/requirements.txt
python3 scripts/azure_deployment/arm_template.py remove aci \
--subscription-id $(CCF_AZURE_SUBSCRIPTION_ID) \
--resource-group ccf-aci \
--aci-type dynamic-agent \
--deployment-name ci-$(Build.BuildNumber)
# python3 scripts/azure_deployment/arm_template.py remove aci \
# --subscription-id $(CCF_AZURE_SUBSCRIPTION_ID) \
# --resource-group ccf-aci \
# --aci-type dynamic-agent \
# --deployment-name ci-$(Build.BuildNumber)
name: cleanup_primary_aci
displayName: "Delete the primary ACIs and Azure Deployments"
continueOnError: true
Expand Down
20 changes: 19 additions & 1 deletion .snpcc_canary
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,22 @@
/-xXx--//-----x=x--/-xXx--/---x---->>>--/
...
/\/\d(-_-)b/\/\
----vmpl---
----vmpl---

,~.
,-'__ `-,
{,-' `. } ,')
,( a ) `-.__ ,',')~,
<==.) ( `-.__,==' ' ' '}
( ) /)
`-'\ , )
| \ `~. /
\ `._ \ /
\ `._____,' ,'
`-. ,'
`-._ _,-'
77jj'
//_||
__//--'/` hjw
,--'/` '
'
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ endfunction()
option(PROFILE_TESTS "Profile tests" OFF)

if("$ENV{CI}" STREQUAL "")
set(PYTHON unbuffer python3)
set(PYTHON python3)
else()
set(PYTHON python3)
endif()
Expand Down
14 changes: 10 additions & 4 deletions docker/ccf_ci_built
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
# Also contains CCF source and build directory

# Latest image as of this change
ARG base=ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
ARG base=mcr.microsoft.com/azurelinux/base/core:3.0
FROM ${base}

# SSH. Note that this could (should) be done in the base ccf_ci image instead
# if we wanted to build this image faster
RUN apt update \
&& apt install -y openssh-server \
RUN tdnf -y update \
&& tdnf -y install openssh-server \
&& sed -i "s/.*PubkeyAuthentication.*/PubkeyAuthentication yes/g" /etc/ssh/sshd_config \
&& sed -i "s/.*PasswordAuthentication.*/PasswordAuthentication no/g" /etc/ssh/sshd_config \
&& mkdir -p /run/sshd # To avoid "Missing privilege separation directory: /run/sshd" error
Expand All @@ -24,10 +24,16 @@ RUN useradd -m $user \
# Copy CCF source and build
RUN mkdir /CCF
COPY . /CCF/
RUN gpg --import /etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY \
&& tdnf -y update \
&& tdnf -y install ca-certificates git \
&& /CCF/scripts/./install-azure-linux-deps.sh
RUN mkdir /CCF/build \
&& cd /CCF/build \
&& cmake -GNinja -DCOMPILE_TARGET=snp .. \
&& CC=`which clang` CXX=`which clang++` cmake -GNinja -DCOMPILE_TARGET=snp .. \
&& ninja \
&& chmod -R 777 /CCF

RUN ssh-keygen -A

CMD ["/usr/sbin/sshd", "-D"]
Loading