Loading src/tests/ofc22/.gitlab-ci.yml +6 −11 Original line number Diff line number Diff line Loading @@ -16,14 +16,13 @@ build ofc22: variables: TEST_NAME: 'ofc22' IMAGE_TAG: 'latest' stage: build before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - docker build -t "${TEST_NAME}:$IMAGE_TAG" -f ./src/tests/${TEST_NAME}/Dockerfile . - docker tag "${TEST_NAME}:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/${TEST_NAME}:$IMAGE_TAG" - docker push "$CI_REGISTRY_IMAGE/${TEST_NAME}:$IMAGE_TAG" - docker build -t "${TEST_NAME}:latest" -f ./src/tests/${TEST_NAME}/Dockerfile . - docker tag "${TEST_NAME}:latest" "$CI_REGISTRY_IMAGE/${TEST_NAME}:latest" - docker push "$CI_REGISTRY_IMAGE/${TEST_NAME}:latest" after_script: - docker images --filter="dangling=true" --quiet | xargs -r docker rmi rules: Loading @@ -40,15 +39,12 @@ build ofc22: end2end_test ofc22: variables: TEST_NAME: 'ofc22' IMAGE_TAG: 'latest' stage: end2end_test before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - echo "TEST_NAME=${TEST_NAME}" - echo "IMAGE_TAG=${IMAGE_TAG}" # Download Docker image to run the test - docker pull "${CI_REGISTRY_IMAGE}/${TEST_NAME}:${IMAGE_TAG}" - docker pull "${CI_REGISTRY_IMAGE}/${TEST_NAME}:latest" # Check MicroK8s is ready - microk8s status --wait-ready Loading @@ -58,9 +54,8 @@ end2end_test ofc22: - source src/tests/${TEST_NAME}/deploy_specs.sh - export TFS_REGISTRY_IMAGES="${CI_REGISTRY_IMAGE}" - export TFS_SKIP_BUILD="YES" - export TFS_IMAGE_TAG="${IMAGE_TAG}" - export TFS_IMAGE_TAG="latest" - echo "TFS_REGISTRY_IMAGES=${CI_REGISTRY_IMAGE}" - echo "TFS_IMAGE_TAG=${IMAGE_TAG}" # Deploy TeraFlowSDN - ./deploy/crdb.sh Loading @@ -75,7 +70,7 @@ end2end_test ofc22: - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server # Run end-to-end tests - docker create --name ${TEST_NAME} -v "$PWD/src/tests/${TEST_NAME}/tests:/opt/results" $CI_REGISTRY_IMAGE/${TEST_NAME}:$IMAGE_TAG ./run_tests.sh - docker create --name ${TEST_NAME} -v "$PWD/src/tests/${TEST_NAME}/tests:/opt/results" $CI_REGISTRY_IMAGE/${TEST_NAME}:latest ./run_tests.sh - docker cp ./tfs_runtime_env_vars.sh ${TEST_NAME}:/var/teraflow/tests/${TEST_NAME} - docker start #- source tfs_runtime_env_vars.sh Loading Loading
src/tests/ofc22/.gitlab-ci.yml +6 −11 Original line number Diff line number Diff line Loading @@ -16,14 +16,13 @@ build ofc22: variables: TEST_NAME: 'ofc22' IMAGE_TAG: 'latest' stage: build before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - docker build -t "${TEST_NAME}:$IMAGE_TAG" -f ./src/tests/${TEST_NAME}/Dockerfile . - docker tag "${TEST_NAME}:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/${TEST_NAME}:$IMAGE_TAG" - docker push "$CI_REGISTRY_IMAGE/${TEST_NAME}:$IMAGE_TAG" - docker build -t "${TEST_NAME}:latest" -f ./src/tests/${TEST_NAME}/Dockerfile . - docker tag "${TEST_NAME}:latest" "$CI_REGISTRY_IMAGE/${TEST_NAME}:latest" - docker push "$CI_REGISTRY_IMAGE/${TEST_NAME}:latest" after_script: - docker images --filter="dangling=true" --quiet | xargs -r docker rmi rules: Loading @@ -40,15 +39,12 @@ build ofc22: end2end_test ofc22: variables: TEST_NAME: 'ofc22' IMAGE_TAG: 'latest' stage: end2end_test before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - echo "TEST_NAME=${TEST_NAME}" - echo "IMAGE_TAG=${IMAGE_TAG}" # Download Docker image to run the test - docker pull "${CI_REGISTRY_IMAGE}/${TEST_NAME}:${IMAGE_TAG}" - docker pull "${CI_REGISTRY_IMAGE}/${TEST_NAME}:latest" # Check MicroK8s is ready - microk8s status --wait-ready Loading @@ -58,9 +54,8 @@ end2end_test ofc22: - source src/tests/${TEST_NAME}/deploy_specs.sh - export TFS_REGISTRY_IMAGES="${CI_REGISTRY_IMAGE}" - export TFS_SKIP_BUILD="YES" - export TFS_IMAGE_TAG="${IMAGE_TAG}" - export TFS_IMAGE_TAG="latest" - echo "TFS_REGISTRY_IMAGES=${CI_REGISTRY_IMAGE}" - echo "TFS_IMAGE_TAG=${IMAGE_TAG}" # Deploy TeraFlowSDN - ./deploy/crdb.sh Loading @@ -75,7 +70,7 @@ end2end_test ofc22: - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server # Run end-to-end tests - docker create --name ${TEST_NAME} -v "$PWD/src/tests/${TEST_NAME}/tests:/opt/results" $CI_REGISTRY_IMAGE/${TEST_NAME}:$IMAGE_TAG ./run_tests.sh - docker create --name ${TEST_NAME} -v "$PWD/src/tests/${TEST_NAME}/tests:/opt/results" $CI_REGISTRY_IMAGE/${TEST_NAME}:latest ./run_tests.sh - docker cp ./tfs_runtime_env_vars.sh ${TEST_NAME}:/var/teraflow/tests/${TEST_NAME} - docker start #- source tfs_runtime_env_vars.sh Loading