From bdd25b567f41ebc120cd73711ab91677389ff9fe Mon Sep 17 00:00:00 2001
From: handreas <andreas.hamacher@monash.edu>
Date: Mon, 2 Mar 2020 08:47:57 +0000
Subject: [PATCH] working on upstream tests
Former-commit-id: fd5e78fc4ef338fd8910ca204ad80f61809b0d0b
---
.gitlab-ci.yml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 287275ce..10765ae5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,18 +6,25 @@ variables:
DEFAULT_PATH: "CICD"
stages:
-# - integration_test_downstream # working but unwanted here
-# - trigger_pipeline_in_B # working but unwanted here
- lint
#- delete_stack_manual
- extended
#- heat_test
- heat
+ - integration_test_downstream
- ansible_create_cluster_stage
- push_button_spawn_cluster
# - e2e
- tests
- clean # manually delete stack
+
+trigger_pipeline_in_B:
+ stage: integration_test_downstream
+ tags:
+ - ansible
+ script:
+ - echo ${CI_JOB_TOKEN}
+ - "curl --request POST --form token=${CI_JOB_TOKEN} --form ref=aciab_upstream https://gitlab.erc.monash.edu.au/api/v4/projects/193/trigger/pipeline" # ID is from clusterbuild
yamllint:
@@ -188,13 +195,6 @@ clean:
- bash -x ./CICD/heat/heatcicdwrapper.sh delete_if_exists $STACKNAME
- #trigger_pipeline_in_B:
-# stage: integration_test_downstream
-# tags:
-# - ansible
-# script:
-# - "curl --request POST --form token=${CI_JOB_TOKEN} --form ref=master https://gitlab.erc.monash.edu.au/api/v4/projects/1085/trigger/pipeline" # ID is from pysshauthz
-
# heat_test:
# stage: heat_test
# allow_failure: false
--
GitLab