diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c26a5ee05..c33b42677 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,11 +33,10 @@ jobs: variables: CLUSTER: '$(cluster)' REGISTRY: '$(registry)' - CLUSTER_NAME: 'fats-$(Build.BuildId)' + CLUSTER_NAME: 'riff-$(Build.BuildId)-$(Agent.JobName)' NAMESPACE: '$(CLUSTER_NAME)' condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest')) steps: - - template: ci/install-gcloud.yml - template: ci/downgrade-docker.yml - bash: ./ci/fats.sh lite displayName: 'Run FATS' @@ -80,16 +79,19 @@ jobs: imageName: ubuntu-16.04 cluster: gke registry: gcr + windows: + imageName: windows-2019 + cluster: gke + registry: gcr pool: vmImage: $(imageName) variables: CLUSTER: '$(cluster)' REGISTRY: '$(registry)' - CLUSTER_NAME: 'fats-$(Build.BuildId)' + CLUSTER_NAME: 'riff-$(Build.BuildId)-$(Agent.JobName)' NAMESPACE: '$(CLUSTER_NAME)' condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) steps: - - template: ci/install-gcloud.yml - template: ci/downgrade-docker.yml - bash: ./ci/fats.sh env: diff --git a/ci/fats-channels.sh b/ci/fats-channels.sh index efd5821d5..ed315f11c 100755 --- a/ci/fats-channels.sh +++ b/ci/fats-channels.sh @@ -25,8 +25,8 @@ kail_output_pid=$! riff channel create $test_name --namespace $NAMESPACE riff subscription create $test_name --channel $test_name --subscriber message-dumper --namespace $NAMESPACE -wait_channel_ready $test_name $NAMESPACE -wait_subscription_ready $test_name $NAMESPACE +wait_knative_ready channels.eventing.knative.dev $test_name $NAMESPACE +wait_knative_ready subscriptions.eventing.knative.dev $test_name $NAMESPACE cat < riff.zip + unzip riff.zip -d /usr/bin/ + rm riff.zip + else + curl https://storage.googleapis.com/projectriff/riff-cli/releases/builds/v${version}-${commit}/riff-linux-amd64.tgz | tar xz + chmod +x riff + sudo cp riff /usr/bin/riff + fi else make build + sudo cp riff /usr/bin/riff fi -sudo cp riff /usr/local/bin/riff travis_fold end install-riff # start FATS @@ -71,15 +78,19 @@ for test in java java-boot node npm command; do run_function $path $function_name $image "${create_args}" $input_data $expected_data done -for test in node command; do - path=${fats_dir}/functions/uppercase/${test} - function_name=fats-local-uppercase-${test} - image=$(fats_image_repo ${function_name}) - create_args="--local-path ." - input_data=riff - expected_data=RIFF +if [ "$machine" != "MinGw" ]; then + for test in node command; do + path=${fats_dir}/functions/uppercase/${test} + function_name=fats-local-uppercase-${test} + image=$(fats_image_repo ${function_name}) + create_args="--local-path ." + input_data=riff + expected_data=RIFF - run_function $path $function_name $image "${create_args}" $input_data $expected_data -done + run_function $path $function_name $image "${create_args}" $input_data $expected_data + done +fi -source `dirname "${BASH_SOURCE[0]}"`/fats-channels.sh +if [ "$machine" != "MinGw" ]; then + source `dirname "${BASH_SOURCE[0]}"`/fats-channels.sh +fi