working on upstream tests

Former-commit-id: fd5e78fc

.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