From 5d4bda2d46eed8bacb81bac9cc29930a0d377a2b Mon Sep 17 00:00:00 2001 From: Matthieu Huin Date: Feb 19 2021 15:29:35 +0000 Subject: Fix enqueue/dequeue tests --- diff --git a/tests/test_zuul_client.yml b/tests/test_zuul_client.yml index 191ce3c..321817f 100644 --- a/tests/test_zuul_client.yml +++ b/tests/test_zuul_client.yml @@ -50,29 +50,23 @@ failed_when: - ah_delete.rc != 0 -- name: get last commit hash on zuul-config - shell: git log -n 1 --pretty=format:"%H" - register: newrev - args: - chdir: "{{ ansible_user_dir }}/zuul-config/" - # works with zuul > 3.19.1 - "trigger" still needed - name: test enqueue-ref - command: zuul-client --insecure --zuul-url http://localhost/ --auth-token {{ raw_token.stdout[7:] }} enqueue-ref --tenant default --project zuul-config --pipeline test --ref refs/heads/master + command: zuul-client --insecure --zuul-url http://localhost/ --auth-token {{ raw_token.stdout[7:] }} enqueue-ref --tenant default --project zuul-config --pipeline check --change 1,1 register: enqueue failed_when: - enqueue.rc != 0 when: zuul_version.stdout.find('3.19.1-') == -1 - name: test enqueue-ref (3.19.1) - command: zuul-client --insecure --zuul-url http://localhost/ --auth-token {{ raw_token.stdout[7:] }} enqueue-ref --tenant default --project zuul-config --pipeline test --ref refs/heads/master --trigger local_git --newrev {{ newrev.stdout }} + command: zuul-client --insecure --zuul-url http://localhost/ --auth-token {{ raw_token.stdout[7:] }} enqueue-ref --tenant default --project zuul-config --pipeline check --change 1,1 --trigger gerrit register: enqueue failed_when: - enqueue.rc != 0 when: zuul_version.stdout.find('3.19.1-') != -1 -# - name: test dequeue -# command: zuul-client --insecure --zuul-url http://localhost/ --auth-token {{ raw_token.stdout[7:] }} dequeue --tenant default --pipeline test --project zuul-config --ref refs/heads/master -# register: dequeue -# failed_when: -# - dequeue.rc != 0 +- name: test dequeue + command: zuul-client --insecure --zuul-url http://localhost/ --auth-token {{ raw_token.stdout[7:] }} dequeue --tenant default --project zuul-config --pipeline check --change 1,1 + register: dequeue + failed_when: + - dequeue.rc != 0