From ab8e59bb3d312edfd64a288e4cca47d1c6e9cbc0 Mon Sep 17 00:00:00 2001 From: Shubhada Date: Tue, 1 Oct 2024 14:50:20 -0700 Subject: [PATCH] fixed the vpn issue --- .pipelines/ci.yml | 184 +++++++++++++++++++++++---------------------- docker-compose.yml | 21 ++++-- 2 files changed, 108 insertions(+), 97 deletions(-) diff --git a/.pipelines/ci.yml b/.pipelines/ci.yml index 0203ee84cfa..24a1d262ea8 100644 --- a/.pipelines/ci.yml +++ b/.pipelines/ci.yml @@ -11,8 +11,6 @@ trigger: include: - v2* -# PR triggers are overridden in the ADO UI - resources: containers: - container: golang @@ -28,147 +26,151 @@ resources: variables: - template: vars.yml -jobs: - - job: Build_Test_And_Push_Az_ARO_Extension - pool: - name: 1es-aro-ci-pool - steps: - - template: ./templates/template-checkout.yml - - # Build and test the Az ARO Extension - - script: | - set -xe - DOCKER_BUILD_CI_ARGS="--load" make ci-azext-aro VERSION=$(Build.BuildId) - displayName: 🛠 Build & Test Az ARO Extension - - # Push the image to ACR - - template: ./templates/template-acr-push.yml - parameters: - acrFQDN: 'arosvcdev.azurecr.io' - repository: 'azext-aro' - pushLatest: true - - - job: Build_And_Test_RP_And_Portal - pool: - name: 1es-aro-ci-pool - steps: - - template: ./templates/template-checkout.yml - - # Build and test RP and Portal - - script: | - set -xe - DOCKER_BUILD_CI_ARGS="--load" make ci-rp VERSION=$(Build.BuildId) - displayName: 🛠 Build & Test RP and Portal - - # Publish test results - - task: PublishTestResults@2 - displayName: 📊 Publish tests results - inputs: - testResultsFiles: $(System.DefaultWorkingDirectory)/report.xml - condition: succeededOrFailed() - - # Publish code coverage results - - task: PublishCodeCoverageResults@2 - displayName: 📈 Publish code coverage - inputs: - codeCoverageTool: Cobertura - summaryFileLocation: $(System.DefaultWorkingDirectory)/coverage.xml - failIfCoverageEmpty: false - condition: succeededOrFailed() +stages: + - stage: Containerized + jobs: + - job: Build_Test_And_Push_Az_ARO_Extension + pool: + name: 1es-aro-ci-pool + steps: + - template: ./templates/template-checkout.yml + + # Build and test the Az ARO Extension + - script: | + set -xe + DOCKER_BUILD_CI_ARGS="--load" make ci-azext-aro VERSION=$(Build.BuildId) + displayName: 🛠 Build & Test Az ARO Extension # Push the image to ACR - template: ./templates/template-acr-push.yml parameters: acrFQDN: 'arosvcdev.azurecr.io' - repository: 'aro' + repository: 'azext-aro' pushLatest: true - - job: Lint_Az_ARO_Extension + - job: Build_And_Test_RP_And_Portal pool: name: 1es-aro-ci-pool - variables: - HOME: $(Agent.BuildDirectory) steps: - template: ./templates/template-checkout.yml + + # Build and test RP and Portal - script: | set -xe - export AZDEV_CONFIG_DIR=$(Agent.BuildDirectory)/azdev-config - make test-python - [[ -z "$(git status -s)" ]] - target: python + DOCKER_BUILD_CI_ARGS="--load" make ci-rp VERSION=$(Build.BuildId) + displayName: 🛠 Build & Test RP and Portal + + # Publish test results + - task: PublishTestResults@2 + displayName: 📊 Publish tests results + inputs: + testResultsFiles: $(System.DefaultWorkingDirectory)/report.xml + condition: succeededOrFailed() + + # Publish code coverage results + - task: PublishCodeCoverageResults@2 + displayName: 📈 Publish code coverage + inputs: + codeCoverageTool: Cobertura + summaryFileLocation: $(System.DefaultWorkingDirectory)/coverage.xml + failIfCoverageEmpty: false + condition: succeededOrFailed() - # New E2E Stage with Docker Compose - - stage: E2E + # Push the image to ACR + - template: ./templates/template-acr-push.yml + parameters: + acrFQDN: 'arosvcdev.azurecr.io' + repository: 'aro' + pushLatest: true + + - stage: E2E # E2E Stage using Docker Compose dependsOn: Containerized jobs: - job: Run_E2E_Tests pool: name: 1es-aro-ci-pool steps: - # Checkout the code + # Step 1: Checkout the code - template: ./templates/template-checkout.yml - # Install Docker Compose and pull the RP image + # Step 2: Pull the RP image from ACR - template: ./templates/e2e-pipeline-template.yml parameters: rpImageACR: 'arosvcdev.azurecr.io' acrCredentialsJSON: $(acr-credentials) - # Install OpenVPN (the command will depend on the agent OS) + # Step 3: Install Docker Compose and Docker - script: | - set -xe - sudo apt-get update && sudo apt-get install -y openvpn || \ - sudo tdnf install -y openvpn || \ - sudo yum install -y openvpn - displayName: Install OpenVPN - - # AZ CLI Login using the existing secret as in the old pipeline + sudo apt-get update + sudo apt-get install -y docker.io docker-compose make + sudo apt-get install -y openvpn + sudo systemctl start docker + sudo systemctl enable docker + displayName: Install OpenVPN, Docker, and Docker Compose + + # Step 4: AZ CLI Login using the existing secret as in the old pipeline - template: ./templates/template-az-cli-login.yml parameters: azureDevOpsJSONSPN: $(aro-v4-e2e-devops-spn) + # Step 5: Download and extract VPN secrets with `make secrets` - script: | - set -xe az account set -s $AZURE_SUBSCRIPTION_ID - - # Download secrets tarball containing the VPN certificates and config - az storage blob download --account-name $(SECRET_SA_ACCOUNT_NAME) --container-name secrets --name vpn-secrets.tar.gz --file vpn-secrets.tar.gz - - # Extract the secrets tarball + #command to download the secrets tarball and set the environment + SECRET_SA_ACCOUNT_NAME=$(SECRET_SA_ACCOUNT_NAME) make secrets + . secrets/env sudo mkdir -p /etc/openvpn - sudo tar -xzf vpn-secrets.tar.gz -C /etc/openvpn + ls -R ./secrets + sudo cp ./secrets/* /etc/openvpn + ls -R /etc/openvpn - # Ensure the extracted files contain the required certificates - ls /etc/openvpn - displayName: Download and Extract VPN Secrets + displayName: Download and Setup VPN Secrets - # Setup Azure and source secrets/env + # Step 6: Setup environment variables for Docker Compose - script: | - set -xe export RP_IMAGE_ACR=arosvcdev.azurecr.io export VERSION=${BUILD_BUILDID} export E2E_FLAGS="--flag1 --flag2" export E2E_LABEL="test-label" - export E2E_DELETE_CLUSTER="false" echo "RP_IMAGE_ACR=$RP_IMAGE_ACR" > .env echo "VERSION=$VERSION" >> .env echo "E2E_FLAGS=$E2E_FLAGS" >> .env echo "E2E_LABEL=$E2E_LABEL" >> .env - cat .env - sudo openvpn --config /etc/openvpn/vpn.conf & + displayName: Set Up Environment Variables + + # Step 7: Start services using Docker Compose + - script: | docker-compose --env-file .env -f docker-compose.yml up -d - displayName: Start OpenVPN and Run Docker Compose for E2E Services + docker ps + displayName: Start Services using Docker Compose - # Log the output from the e2e container in case of failure + # Step 8: Execute E2E tests - script: | - set -xe - docker-compose logs e2e - displayName: Log E2E Test Output + docker-compose exec e2e-container make test-e2e + displayName: Execute E2E Tests + + # Step 9: Log the output from the services in case of failure + - script: | + docker-compose logs vpn + docker-compose logs selenium + docker-compose logs rp + displayName: Log Service Output condition: failed() - # Clean up Docker Compose + # Step 10: Clean up Docker Compose services - script: | docker-compose down - displayName: Cleanup Docker Compose + displayName: Cleanup Docker Compose Services condition: always() + + # Step 11: Cleanup Azure resources + - script: | + export CI=true + . ./hack/e2e/run-rp-and-e2e.sh + clean_e2e_db + displayName: Cleanup (Azure) + condition: always() + + # Step 12: AZ CLI Logout + - template: ./templates/template-az-cli-logout.yml diff --git a/docker-compose.yml b/docker-compose.yml index 93a8eb2eb27..0da3063b7ab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,8 +2,7 @@ version: '3.8' services: vpn: - # Use an image with OpenVPN installed (or you can use the previous image and install OpenVPN at runtime) - image: kylemanna/openvpn + image: registry.access.redhat.com/ubi8/toolbox:8.8 container_name: vpn-container privileged: true # Required for OpenVPN network_mode: host # Use host network @@ -12,12 +11,22 @@ services: - /etc/openvpn:/etc/openvpn # Mount the extracted VPN secrets devices: - /dev/net/tun # Required for VPN to access tunnel - command: ["openvpn", "--config", "/etc/openvpn/vpn.conf"] # Start OpenVPN with existing config + command: | + /bin/bash -c " + sudo rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ + sudo dnf install -y openvpn && \ + ls /etc/openvpn && \ + openvpn --config /etc/openvpn/vpn.conf" + healthcheck: + test: ["CMD", "pidof", "openvpn"] + interval: 30s + timeout: 10s + retries: 3 selenium: image: selenium/standalone-chrome container_name: selenium-container - network_mode: host # Use host network (no need for port mappings) + network_mode: host healthcheck: test: ["CMD", "curl", "-f", "http://localhost:4444"] interval: 30s @@ -27,7 +36,7 @@ services: rp: image: ${RP_IMAGE_ACR}/aro:${VERSION} container_name: rp-container - network_mode: host # Use host network + network_mode: host depends_on: vpn: condition: service_healthy @@ -40,7 +49,7 @@ services: e2e: image: ${RP_IMAGE_ACR}/aro:${VERSION} container_name: e2e-container - network_mode: host # Use host network + network_mode: host depends_on: rp: condition: service_healthy